fix MultipleObjectsReturned?

yepcord/rest_api/routes/applications.py

@@ -51,7 +51,7 @@ async def create_application(data: CreateApplication, user: User = DepUser):
     app = await Application.create(id=app_id, owner=user, name=name)
     bot_user = await User.create(id=app_id, email=f"bot_{app_id}", password="", is_bot=True)
     await UserData.create(id=app_id, user=bot_user, birth=datetime.now(), username=username, discriminator=disc)
-    await UserSettings.create(id=app_id, user=user, locale=(await user.settings).locale)
+    await UserSettings.create(id=app_id, user=bot_user, locale=(await user.settings).locale)
     await Bot.create(id=app_id, application=app, user=bot_user)
     return await app.ds_json()
 

yepcord/yepcord/models/bot.py

@@ -35,8 +35,8 @@ def gen_token_secret() -> str:
 
 class Bot(Model):
     id: int = SnowflakeField(pk=True)
-    application: models.Application = fields.ForeignKeyField("models.Application", null=False, unique=True)
-    user: User = fields.ForeignKeyField("models.User", null=True, default=None, related_name="bot_user")
+    application: models.Application = fields.OneToOneField("models.Application")
+    user: User = fields.OneToOneField("models.User", null=True, default=None, related_name="bot_user")
     bot_public: bool = fields.BooleanField(default=True)
     bot_require_code_grant: bool = fields.BooleanField(default=True)
     token_secret: str = fields.CharField(max_length=128, default=gen_token_secret)

yepcord/yepcord/models/frecency_settings.py

@@ -26,7 +26,7 @@
 
 class FrecencySettings(Model):
     id: int = SnowflakeField(pk=True)
-    user: models.User = fields.ForeignKeyField("models.User")
+    user: models.User = fields.OneToOneField("models.User")
     settings: str = fields.TextField()
 
     def to_proto(self) -> FrecencyUserSettings:

yepcord/yepcord/models/guild_member.py

@@ -97,6 +97,11 @@ class GuildMember(Model):
 
     guildevents: fields.ReverseRelation[models.GuildEvent]
 
+    class Meta:
+        unique_together = (
+            ("user", "guild"),
+        )
+
     @property
     def joined_at(self) -> datetime:
         return Snowflake.toDatetime(self.id)

yepcord/yepcord/models/guild_template.py

@@ -33,7 +33,7 @@
 class GuildTemplate(Model):
     id: int = SnowflakeField(pk=True)
     name: str = fields.CharField(max_length=64)
-    guild: models.Guild = fields.ForeignKeyField("models.Guild")
+    guild: models.Guild = fields.OneToOneField("models.Guild")
     description: Optional[str] = fields.CharField(max_length=128, null=True, default=None)
     usage_count: int = fields.BigIntField(default=0)
     creator: Optional[models.User] = fields.ForeignKeyField("models.User", on_delete=fields.SET_NULL, null=True)

yepcord/yepcord/models/readstate.py

@@ -30,6 +30,11 @@ class ReadState(Model):
     last_read_id: int = fields.BigIntField()
     count: int = fields.IntField()
 
+    class Meta:
+        unique_together = (
+            ("channel", "user"),
+        )
+
     async def ds_json(self) -> dict:
         last_pin = await getCore().getLastPinnedMessage(self.channel)
         last_pin_ts = last_pin.pinned_timestamp.strftime("%Y-%m-%dT%H:%M:%S+00:00") if last_pin is not None else None

yepcord/yepcord/models/thread_member.py

@@ -32,6 +32,11 @@ class ThreadMember(Model):
     channel: models.Channel = fields.ForeignKeyField("models.Channel")
     guild: models.Guild = fields.ForeignKeyField("models.Guild")
 
+    class Meta:
+        unique_together = (
+            ("user", "channel"),
+        )
+
     @property
     def joined_at(self) -> datetime:
         return Snowflake.toDatetime(self.id)

yepcord/yepcord/models/thread_metadata.py

@@ -27,7 +27,7 @@
 
 class ThreadMetadata(Model):
     id: int = SnowflakeField(pk=True)
-    channel: models.Channel = fields.ForeignKeyField("models.Channel")
+    channel: models.Channel = fields.OneToOneField("models.Channel")
     archived: bool = fields.BooleanField(default=False)
     locked: bool = fields.BooleanField(default=False)
     archive_timestamp: datetime = fields.DatetimeField()

yepcord/yepcord/models/user_note.py

@@ -28,6 +28,11 @@ class UserNote(Model):
     target: models.User = fields.ForeignKeyField("models.User", related_name="target")
     text: str = fields.CharField(null=True, default=None, max_length=256)
 
+    class Meta:
+        unique_together = (
+            ("user", "target"),
+        )
+
     def ds_json(self) -> dict:
         return {
             "user_id": self.user.id,

yepcord/yepcord/models/user_settings.py

@@ -35,7 +35,7 @@
 
 class UserSettings(Model):
     id: int = SnowflakeField(pk=True)
-    user: models.User = fields.ForeignKeyField("models.User")
+    user: models.User = fields.OneToOneField("models.User")
     inline_attachment_media: bool = fields.BooleanField(default=True)
     show_current_game: bool = fields.BooleanField(default=True)
     view_nsfw_guilds: bool = fields.BooleanField(default=False)

yepcord/yepcord/models/userdata.py

@@ -31,7 +31,7 @@ class Meta:
         unique_together = (("username", "discriminator"),)
 
     id: int = SnowflakeField(pk=True)
-    user: models.User = fields.ForeignKeyField("models.User")
+    user: models.User = fields.OneToOneField("models.User")
     birth: date = fields.DateField()
     username: str = fields.CharField(max_length=128)
     discriminator: int = fields.IntField(validators=[MinValueValidator(0), MaxValueValidator(9999)])