Bennett/Arcaea-server
1
0
Fork 0
mirror of https://github.com/Lost-MSth/Arcaea-server.git synced 2026-02-08 16:57:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix a big bug

Browse Source 
- Fix a bug that the server gets all items as one user's item
This commit is contained in:
Lost-MSth
2022-07-09 23:05:33 +08:00
parent 15134173c9
commit ef8e551261
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
latest version/core/item.py
View File

@@ -373,8 +373,8 @@ class UserItemList:
self.c.execute( self.c.execute(
'''select item_id from item where type=?''', (item_type,)) '''select item_id from item where type=?''', (item_type,))
else: else:
self.c.execute('''select item_id, amount from user_item where type = :a''', { self.c.execute('''select item_id, amount from user_item where type = :a and user_id = :b''', {
'a': item_type}) 'a': item_type, 'b': self.user.user_id})
x = self.c.fetchall() x = self.c.fetchall()
if not x: if not x:
return self return self

12
latest version/core/user.py
View File

@@ -302,7 +302,7 @@ class UserInfo(User):
@property @property
def cores(self) -> list: def cores(self) -> list:
if self.__cores is None: if self.__cores is None:
x = UserItemList(self.c, self.user_id).select_from_type('core') x = UserItemList(self.c, self).select_from_type('core')
self.__cores = [{'core_type': i.item_id, self.__cores = [{'core_type': i.item_id,
'amount': i.amount} for i in x.items] 'amount': i.amount} for i in x.items]
@@ -311,7 +311,7 @@ class UserInfo(User):
@property @property
def singles(self) -> list: def singles(self) -> list:
if self.__singles is None: if self.__singles is None:
x = UserItemList(self.c, self.user_id).select_from_type('single') x = UserItemList(self.c, self).select_from_type('single')
self.__singles = [i.item_id for i in x.items] self.__singles = [i.item_id for i in x.items]
return self.__singles return self.__singles
@@ -319,7 +319,7 @@ class UserInfo(User):
@property @property
def packs(self) -> list: def packs(self) -> list:
if self.__packs is None: if self.__packs is None:
x = UserItemList(self.c, self.user_id).select_from_type('pack') x = UserItemList(self.c, self).select_from_type('pack')
self.__packs = [i.item_id for i in x.items] self.__packs = [i.item_id for i in x.items]
return self.__packs return self.__packs
@@ -327,7 +327,7 @@ class UserInfo(User):
@property @property
def world_unlocks(self) -> list: def world_unlocks(self) -> list:
if self.__world_unlocks is None: if self.__world_unlocks is None:
x = UserItemList(self.c, self.user_id).select_from_type( x = UserItemList(self.c, self).select_from_type(
'world_unlock') 'world_unlock')
self.__world_unlocks = [i.item_id for i in x.items] self.__world_unlocks = [i.item_id for i in x.items]
@@ -337,7 +337,7 @@ class UserInfo(User):
def world_songs(self) -> list: def world_songs(self) -> list:
if self.__world_songs is None: if self.__world_songs is None:
x = UserItemList( x = UserItemList(
self.c, self.user_id).select_from_type('world_song') self.c, self).select_from_type('world_song')
self.__world_songs = [i.item_id for i in x.items] self.__world_songs = [i.item_id for i in x.items]
return self.__world_songs return self.__world_songs
@@ -346,7 +346,7 @@ class UserInfo(User):
def course_banners(self) -> list: def course_banners(self) -> list:
if self.__course_banners is None: if self.__course_banners is None:
x = UserItemList( x = UserItemList(
self.c, self.user_id).select_from_type('course_banner') self.c, self).select_from_type('course_banner')
self.__course_banners = [i.item_id for i in x.items] self.__course_banners = [i.item_id for i in x.items]
return self.__course_banners return self.__course_banners