rework database

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

1 files changed, 106 insertions, 39 deletions

diff --git a/appinfo/database.xml b/appinfo/database.xml
index 5d750abb..7c99fbc5 100644
--- a/appinfo/database.xml
+++ b/appinfo/database.xml
@@ -6,16 +6,14 @@
 	<charset>utf8</charset>
 
 	<table>
-		<name>*dbprefix*social_accounts</name>
+		<name>*dbprefix*social_server_actors</name>
 		<declaration>
 
 			<field>
 				<name>id</name>
-				<type>integer</type>
-				<length>7</length>
-				<unsigned>true</unsigned>
+				<type>text</type>
+				<length>127</length>
 				<notnull>true</notnull>
-				<autoincrement>true</autoincrement>
 				<primary>true</primary>
 			</field>
 
@@ -23,67 +21,74 @@
 				<name>user_id</name>
 				<type>text</type>
 				<length>63</length>
+				<notnull>true</notnull>
 			</field>
 
 			<field>
-				<name>account</name>
+				<name>preferred_username</name>
 				<type>text</type>
-				<length>63</length>
+				<length>127</length>
+				<notnull>true</notnull>
 			</field>
 
 			<field>
-				<name>creation</name>
-				<type>timestamp</type>
+				<name>name</name>
+				<type>text</type>
+				<length>127</length>
+				<notnull>true</notnull>
 			</field>
 
-		</declaration>
-	</table>
-
-	<table>
-		<name>*dbprefix*social_server_actors</name>
-		<declaration>
-
 			<field>
-				<name>id</name>
-				<type>integer</type>
-				<length>7</length>
-				<unsigned>true</unsigned>
+				<name>summary</name>
+				<type>text</type>
+				<length>500</length>
 				<notnull>true</notnull>
-				<autoincrement>true</autoincrement>
-				<primary>true</primary>
 			</field>
 
 			<field>
-				<name>type</name>
+				<name>public_key</name>
 				<type>text</type>
-				<length>15</length>
-				<notnull>true</notnull>
+				<length>1000</length>
 			</field>
 
 			<field>
-				<name>user_id</name>
+				<name>private_key</name>
 				<type>text</type>
-				<length>63</length>
-				<notnull>true</notnull>
+				<length>2000</length>
 			</field>
 
 			<field>
-				<name>preferred_username</name>
+				<name>creation</name>
+				<type>timestamp</type>
+			</field>
+
+		</declaration>
+	</table>
+
+	<table>
+		<name>*dbprefix*social_server_follows</name>
+		<declaration>
+
+			<field>
+				<name>id</name>
 				<type>text</type>
 				<length>127</length>
 				<notnull>true</notnull>
+				<primary>true</primary>
 			</field>
 
 			<field>
-				<name>public_key</name>
+				<name>actor_id</name>
 				<type>text</type>
-				<length>1000</length>
+				<length>127</length>
+				<notnull>true</notnull>
 			</field>
 
 			<field>
-				<name>private_key</name>
+				<name>object_id</name>
 				<type>text</type>
-				<length>2000</length>
+				<length>127</length>
+				<notnull>true</notnull>
 			</field>
 
 			<field>
@@ -131,6 +136,7 @@
 				<type>text</type>
 				<length>127</length>
 				<notnull>true</notnull>
+				<primary>true</primary>
 			</field>
 
 			<!--<field>-->
@@ -215,11 +221,9 @@
 
 			<field>
 				<name>id</name>
-				<type>integer</type>
-				<length>8</length>
-				<unsigned>true</unsigned>
+				<type>string</type>
+				<length>127</length>
 				<notnull>true</notnull>
-				<autoincrement>true</autoincrement>
 				<primary>true</primary>
 			</field>
 
@@ -231,6 +235,48 @@
 			</field>
 
 			<field>
+				<name>following</name>
+				<type>text</type>
+				<length>127</length>
+				<notnull>true</notnull>
+			</field>
+
+			<field>
+				<name>followers</name>
+				<type>text</type>
+				<length>127</length>
+				<notnull>true</notnull>
+			</field>
+
+			<field>
+				<name>inbox</name>
+				<type>text</type>
+				<length>127</length>
+				<notnull>true</notnull>
+			</field>
+
+			<field>
+				<name>shared_inbox</name>
+				<type>text</type>
+				<length>127</length>
+				<notnull>true</notnull>
+			</field>
+
+			<field>
+				<name>outbox</name>
+				<type>text</type>
+				<length>127</length>
+				<notnull>true</notnull>
+			</field>
+
+			<field>
+				<name>featured</name>
+				<type>text</type>
+				<length>127</length>
+				<notnull>true</notnull>
+			</field>
+
+			<field>
 				<name>url</name>
 				<type>text</type>
 				<length>127</length>
@@ -238,9 +284,30 @@
 			</field>
 
 			<field>
-				<name>actor</name>
+				<name>preferred_username</name>
+				<type>text</type>
+				<length>127</length>
+				<notnull>true</notnull>
+			</field>
+
+			<field>
+				<name>name</name>
+				<type>text</type>
+				<length>127</length>
+				<notnull>true</notnull>
+			</field>
+
+			<field>
+				<name>summary</name>
+				<type>text</type>
+				<length>500</length>
+				<notnull>true</notnull>
+			</field>
+
+			<field>
+				<name>public_key</name>
 				<type>text</type>
-				<length>8000</length>
+				<length>500</length>
 				<notnull>true</notnull>
 			</field>