MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-04-19 06:43:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

improve search feed table sql query

Browse Source
This commit is contained in:
pa
2026-01-24 22:34:34 +09:00
parent a6092efd94
commit cbd41598b5
2 changed files with 103 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

193
src/service/database/feed.js
View File

@@ -89,20 +89,19 @@ const feed = {
vipList, vipList,
maxEntries = dbVars.maxTableSize maxEntries = dbVars.maxTableSize
) { ) {
search = search.replaceAll("'", "''");
if (search.startsWith('wrld_') || search.startsWith('grp_')) { if (search.startsWith('wrld_') || search.startsWith('grp_')) {
return this.getFeedByInstanceId(search, filters, vipList); return this.getFeedByInstanceId(search, filters, vipList);
} }
var vipQuery = ''; var vipQuery = '';
var vipArgs = {};
if (vipList.length > 0) { if (vipList.length > 0) {
vipQuery = 'AND user_id IN ('; var vipPlaceholders = [];
vipList.forEach((vip, i) => { vipList.forEach((vip, i) => {
vipQuery += `'${vip.replaceAll("'", "''")}'`; var key = `@vip_${i}`;
if (i < vipList.length - 1) { vipArgs[key] = vip;
vipQuery += ', '; vipPlaceholders.push(key);
}
}); });
vipQuery += ')'; vipQuery = `AND user_id IN (${vipPlaceholders.join(', ')})`;
} }
var gps = true; var gps = true;
var status = true; var status = true;
@@ -142,77 +141,57 @@ const feed = {
} }
}); });
} }
var feedDatabase = []; var searchLike = `%${search}%`;
var selects = [];
var baseColumns = [
'id',
'created_at',
'user_id',
'display_name',
'type',
'location',
'world_name',
'previous_location',
'time',
'group_name',
'status',
'status_description',
'previous_status',
'previous_status_description',
'bio',
'previous_bio',
'owner_id',
'avatar_name',
'current_avatar_image_url',
'current_avatar_thumbnail_image_url',
'previous_current_avatar_image_url',
'previous_current_avatar_thumbnail_image_url'
].join(', ');
if (gps) { if (gps) {
await sqliteService.execute((dbRow) => { selects.push(
var row = { `SELECT * FROM (SELECT id, created_at, user_id, display_name, 'GPS' AS type, location, world_name, previous_location, time, group_name, NULL AS status, NULL AS status_description, NULL AS previous_status, NULL AS previous_status_description, NULL AS bio, NULL AS previous_bio, NULL AS owner_id, NULL AS avatar_name, NULL AS current_avatar_image_url, NULL AS current_avatar_thumbnail_image_url, NULL AS previous_current_avatar_image_url, NULL AS previous_current_avatar_thumbnail_image_url FROM ${dbVars.userPrefix}_feed_gps WHERE (display_name LIKE @searchLike OR world_name LIKE @searchLike OR group_name LIKE @searchLike) ${vipQuery} ORDER BY id DESC LIMIT @perTable)`
rowId: dbRow[0], );
created_at: dbRow[1],
userId: dbRow[2],
displayName: dbRow[3],
type: 'GPS',
location: dbRow[4],
worldName: dbRow[5],
previousLocation: dbRow[6],
time: dbRow[7],
groupName: dbRow[8]
};
feedDatabase.push(row);
}, `SELECT * FROM ${dbVars.userPrefix}_feed_gps WHERE (display_name LIKE '%${search}%' OR world_name LIKE '%${search}%' OR group_name LIKE '%${search}%') ${vipQuery} ORDER BY id DESC LIMIT ${maxEntries}`);
} }
if (status) { if (status) {
await sqliteService.execute((dbRow) => { selects.push(
var row = { `SELECT * FROM (SELECT id, created_at, user_id, display_name, 'Status' AS type, NULL AS location, NULL AS world_name, NULL AS previous_location, NULL AS time, NULL AS group_name, status, status_description, previous_status, previous_status_description, NULL AS bio, NULL AS previous_bio, NULL AS owner_id, NULL AS avatar_name, NULL AS current_avatar_image_url, NULL AS current_avatar_thumbnail_image_url, NULL AS previous_current_avatar_image_url, NULL AS previous_current_avatar_thumbnail_image_url FROM ${dbVars.userPrefix}_feed_status WHERE (display_name LIKE @searchLike OR status LIKE @searchLike OR status_description LIKE @searchLike) ${vipQuery} ORDER BY id DESC LIMIT @perTable)`
rowId: dbRow[0], );
created_at: dbRow[1],
userId: dbRow[2],
displayName: dbRow[3],
type: 'Status',
status: dbRow[4],
statusDescription: dbRow[5],
previousStatus: dbRow[6],
previousStatusDescription: dbRow[7]
};
feedDatabase.push(row);
}, `SELECT * FROM ${dbVars.userPrefix}_feed_status WHERE (display_name LIKE '%${search}%' OR status LIKE '%${search}%' OR status_description LIKE '%${search}%') ${vipQuery} ORDER BY id DESC LIMIT ${maxEntries}`);
} }
if (bio) { if (bio) {
await sqliteService.execute((dbRow) => { selects.push(
var row = { `SELECT * FROM (SELECT id, created_at, user_id, display_name, 'Bio' AS type, NULL AS location, NULL AS world_name, NULL AS previous_location, NULL AS time, NULL AS group_name, NULL AS status, NULL AS status_description, NULL AS previous_status, NULL AS previous_status_description, bio, previous_bio, NULL AS owner_id, NULL AS avatar_name, NULL AS current_avatar_image_url, NULL AS current_avatar_thumbnail_image_url, NULL AS previous_current_avatar_image_url, NULL AS previous_current_avatar_thumbnail_image_url FROM ${dbVars.userPrefix}_feed_bio WHERE (display_name LIKE @searchLike OR bio LIKE @searchLike) ${vipQuery} ORDER BY id DESC LIMIT @perTable)`
rowId: dbRow[0], );
created_at: dbRow[1],
userId: dbRow[2],
displayName: dbRow[3],
type: 'Bio',
bio: dbRow[4],
previousBio: dbRow[5]
};
feedDatabase.push(row);
}, `SELECT * FROM ${dbVars.userPrefix}_feed_bio WHERE (display_name LIKE '%${search}%' OR bio LIKE '%${search}%') ${vipQuery} ORDER BY id DESC LIMIT ${maxEntries}`);
} }
if (avatar) { if (avatar) {
var avatarQuery = ''; var avatarQuery = '';
if (aviPrivate) { if (aviPrivate) {
avatarQuery = 'OR user_id = owner_id'; avatarQuery = 'AND user_id = owner_id';
} else if (aviPublic) { } else if (aviPublic) {
avatarQuery = 'OR user_id != owner_id'; avatarQuery = 'AND user_id != owner_id';
} }
await sqliteService.execute((dbRow) => { selects.push(
var row = { `SELECT * FROM (SELECT id, created_at, user_id, display_name, 'Avatar' AS type, NULL AS location, NULL AS world_name, NULL AS previous_location, NULL AS time, NULL AS group_name, NULL AS status, NULL AS status_description, NULL AS previous_status, NULL AS previous_status_description, NULL AS bio, NULL AS previous_bio, owner_id, avatar_name, current_avatar_image_url, current_avatar_thumbnail_image_url, previous_current_avatar_image_url, previous_current_avatar_thumbnail_image_url FROM ${dbVars.userPrefix}_feed_avatar WHERE (display_name LIKE @searchLike OR avatar_name LIKE @searchLike) ${avatarQuery} ${vipQuery} ORDER BY id DESC LIMIT @perTable)`
rowId: dbRow[0], );
created_at: dbRow[1],
userId: dbRow[2],
displayName: dbRow[3],
type: 'Avatar',
ownerId: dbRow[4],
avatarName: dbRow[5],
currentAvatarImageUrl: dbRow[6],
currentAvatarThumbnailImageUrl: dbRow[7],
previousCurrentAvatarImageUrl: dbRow[8],
previousCurrentAvatarThumbnailImageUrl: dbRow[9]
};
feedDatabase.push(row);
}, `SELECT * FROM ${dbVars.userPrefix}_feed_avatar WHERE ((display_name LIKE '%${search}%' OR avatar_name LIKE '%${search}%') ${avatarQuery}) ${vipQuery} ORDER BY id DESC LIMIT ${maxEntries}`);
} }
if (online || offline) { if (online || offline) {
var query = ''; var query = '';
@@ -223,36 +202,69 @@ const feed = {
query = "AND type = 'Offline'"; query = "AND type = 'Offline'";
} }
} }
await sqliteService.execute((dbRow) => { selects.push(
`SELECT * FROM (SELECT id, created_at, user_id, display_name, type, location, world_name, NULL AS previous_location, time, group_name, NULL AS status, NULL AS status_description, NULL AS previous_status, NULL AS previous_status_description, NULL AS bio, NULL AS previous_bio, NULL AS owner_id, NULL AS avatar_name, NULL AS current_avatar_image_url, NULL AS current_avatar_thumbnail_image_url, NULL AS previous_current_avatar_image_url, NULL AS previous_current_avatar_thumbnail_image_url FROM ${dbVars.userPrefix}_feed_online_offline WHERE (display_name LIKE @searchLike OR world_name LIKE @searchLike OR group_name LIKE @searchLike) ${query} ${vipQuery} ORDER BY id DESC LIMIT @perTable)`
);
}
if (selects.length === 0) {
return [];
}
var feedDatabase = [];
var args = {
'@searchLike': searchLike,
'@limit': maxEntries,
'@perTable': maxEntries,
...vipArgs
};
await sqliteService.execute(
(dbRow) => {
var type = dbRow[4];
var row = { var row = {
rowId: dbRow[0], rowId: dbRow[0],
created_at: dbRow[1], created_at: dbRow[1],
userId: dbRow[2], userId: dbRow[2],
displayName: dbRow[3], displayName: dbRow[3],
type: dbRow[4], type
location: dbRow[5],
worldName: dbRow[6],
time: dbRow[7],
groupName: dbRow[8]
}; };
switch (type) {
case 'GPS':
row.location = dbRow[5];
row.worldName = dbRow[6];
row.previousLocation = dbRow[7];
row.time = dbRow[8];
row.groupName = dbRow[9];
break;
case 'Status':
row.status = dbRow[10];
row.statusDescription = dbRow[11];
row.previousStatus = dbRow[12];
row.previousStatusDescription = dbRow[13];
break;
case 'Bio':
row.bio = dbRow[14];
row.previousBio = dbRow[15];
break;
case 'Avatar':
row.ownerId = dbRow[16];
row.avatarName = dbRow[17];
row.currentAvatarImageUrl = dbRow[18];
row.currentAvatarThumbnailImageUrl = dbRow[19];
row.previousCurrentAvatarImageUrl = dbRow[20];
row.previousCurrentAvatarThumbnailImageUrl = dbRow[21];
break;
case 'Online':
case 'Offline':
row.location = dbRow[5];
row.worldName = dbRow[6];
row.time = dbRow[8];
row.groupName = dbRow[9];
break;
}
feedDatabase.push(row); feedDatabase.push(row);
}, `SELECT * FROM ${dbVars.userPrefix}_feed_online_offline WHERE ((display_name LIKE '%${search}%' OR world_name LIKE '%${search}%' OR group_name LIKE '%${search}%') ${query}) ${vipQuery} ORDER BY id DESC LIMIT ${maxEntries}`); },
} `SELECT ${baseColumns} FROM (${selects.join(' UNION ALL ')}) ORDER BY created_at DESC, id DESC LIMIT @limit`,
var compareByCreatedAt = function (a, b) { args
var A = a.created_at; );
var B = b.created_at;
if (A < B) {
return -1;
}
if (A > B) {
return 1;
}
return 0;
};
feedDatabase.sort(compareByCreatedAt);
if (feedDatabase.length > maxEntries) {
feedDatabase.splice(0, feedDatabase.length - maxEntries);
}
return feedDatabase; return feedDatabase;
}, },
@@ -424,7 +436,6 @@ const feed = {
`SELECT ${baseColumns} FROM (${selects.join(' UNION ALL ')}) ORDER BY created_at DESC, id DESC LIMIT @limit`, `SELECT ${baseColumns} FROM (${selects.join(' UNION ALL ')}) ORDER BY created_at DESC, id DESC LIMIT @limit`,
args args
); );
console.log('feedDatabase length:', feedDatabase.length);
return feedDatabase; return feedDatabase;
}, },

4
src/stores/feed.js
View File

@@ -156,9 +156,7 @@ export const useFeedStore = defineStore('Feed', () => {
vipList vipList
); );
feedTableData.value = []; feedTableData.value = [];
feedTableData.value = search feedTableData.value = [...feedTableData.value, ...rows];
? [...feedTableData.value, ...rows.reverse()]
: [...feedTableData.value, ...rows];
feedTable.value.loading = false; feedTable.value.loading = false;
} }