This commit is contained in:
Natsumi
2025-04-28 20:19:20 +10:00
parent 00fd2e6322
commit 53eee91d21
4 changed files with 20 additions and 7 deletions

View File

@@ -10,6 +10,11 @@ const userReq = {
return window.API.call(`users/${params.userId}`, { return window.API.call(`users/${params.userId}`, {
method: 'GET' method: 'GET'
}).then((json) => { }).then((json) => {
if (!json) {
throw new Error(
`getUser missing user data for: ${params.userId}`
);
}
const args = { const args = {
json, json,
params params

View File

@@ -532,6 +532,10 @@ console.log(`isLinux: ${LINUX}`);
API.$on('USER:LIST', function (args) { API.$on('USER:LIST', function (args) {
for (var json of args.json) { for (var json of args.json) {
if (!json.displayName) {
console.error('getUsers gave us garbage', json);
continue;
}
this.$emit('USER', { this.$emit('USER', {
json, json,
params: { params: {

View File

@@ -2192,13 +2192,9 @@ class Database {
addAvatarToHistory(avatarId) { addAvatarToHistory(avatarId) {
sqliteService.executeNonQuery( sqliteService.executeNonQuery(
`UPDATE ${Database.userPrefix}_avatar_history `INSERT INTO ${Database.userPrefix}_avatar_history (avatar_id, created_at, time)
SET created_at = @created_at, time = COALESCE(time, 0) VALUES (@avatar_id, @created_at, 0)
WHERE avatar_id = @avatar_id; ON CONFLICT(avatar_id) DO UPDATE SET created_at = @created_at`,
INSERT INTO ${Database.userPrefix}_avatar_history (avatar_id, created_at, time)
SELECT @avatar_id, @created_at, 0
WHERE NOT EXISTS (SELECT * FROM ${Database.userPrefix}_avatar_history WHERE avatar_id = @avatar_id)`,
{ {
'@avatar_id': avatarId, '@avatar_id': avatarId,
'@created_at': new Date().toJSON() '@created_at': new Date().toJSON()

View File

@@ -121,6 +121,14 @@
<span class="name" v-text="favorite.name || favorite.id"></span> <span class="name" v-text="favorite.name || favorite.id"></span>
</div> </div>
<el-button <el-button
v-if="isLocalFavorite"
type="text"
icon="el-icon-close"
size="mini"
style="margin-left: 5px"
@click.stop="removeLocalAvatarFavorite"></el-button>
<el-button
v-else
type="text" type="text"
icon="el-icon-close" icon="el-icon-close"
size="mini" size="mini"