Move feed/friendLog/memos into SQLite

VRCXStorage.cs

@@ -1,4 +1,4 @@
-// Copyright(c) 2019 pypy. All rights reserved.
+// Copyright(c) 2019 pypy. All rights reserved.
 //
 // This work is licensed under the terms of the MIT license.
 // For a copy, see <https://opensource.org/licenses/MIT>.
@@ -122,5 +122,18 @@ namespace VRCX
                 m_Lock.ExitWriteLock();
             }
         }
+
+        public string GetAll()
+        {
+            m_Lock.EnterReadLock();
+            try
+            {
+                return System.Text.Json.JsonSerializer.Serialize(m_Storage);
+            }
+            finally
+            {
+                m_Lock.ExitReadLock();
+            }
+        }
     }
 }

html/src/app.js

@@ -23,6 +23,7 @@ import configRepository from './repository/config.js';
 import webApiService from './service/webapi.js';
 import gameLogService from './service/gamelog.js';
 import security from './security.js';
+import database from './repository/database.js';
 
 speechSynthesis.getVoices();
 
@@ -849,7 +850,9 @@ speechSynthesis.getVoices();
         template: '<div @click="confirm" style="cursor:pointer;width:fit-content;display:inline-block;vertical-align:top"><span style="display:inline-block;margin-right:5px">{{ avatarName }}</span><span :class="color">{{ avatarType }}</span></div>',
         props: {
             imageurl: String,
-            userid: String
+            userid: String,
+            hintownerid: String,
+            hintavatarname: String
         },
         data() {
             return {
@@ -860,15 +863,25 @@ speechSynthesis.getVoices();
         },
         methods: {
             async parse() {
+                this.ownerId = '';
                 this.avatarName = '';
                 this.avatarType = '';
                 this.color = '';
-                var avatarInfo = await $app.getAvatarName(this.imageurl);
+                if (this.hintownerid) {
-                this.avatarName = avatarInfo.avatarName;
+                    this.avatarName = this.hintavatarname;
-                if ((typeof this.userid === 'undefined') || (!avatarInfo.ownerId)) {
+                    this.ownerId = this.hintownerid;
+                } else {
+                    try {
+                        var avatarInfo = await $app.getAvatarName(this.imageurl);
+                        this.avatarName = avatarInfo.avatarName;
+                        this.ownerId = avatarInfo.ownerId;
+                    } catch (err) {
+                    }
+                }
+                if ((typeof this.userid === 'undefined') || (!this.ownerId)) {
                     this.color = 'avatar-info-unknown';
                     this.avatarType = '(unknown)';
-                } else if (avatarInfo.ownerId === this.userid) {
+                } else if (this.ownerId === this.userid) {
                     this.color = 'avatar-info-own';
                     this.avatarType = '(own)';
                 } else {
@@ -1758,21 +1771,6 @@ speechSynthesis.getVoices();
 
     // API: Friend
 
-    API.friends200 = new Set();
-    API.friends404 = new Map();
-    API.isFriendsLoading = false;
-
-    API.$on('LOGIN', function () {
-        this.friends200.clear();
-        this.friends404.clear();
-        this.isFriendsLoading = false;
-    });
-
-    API.$on('USER', function (args) {
-        this.friends200.add(args.ref.id);
-        this.friends404.delete(args.ref.id);
-    });
-
     API.$on('FRIEND:LIST', function (args) {
         for (var json of args.json) {
             this.$emit('USER', {
@@ -1784,65 +1782,45 @@ speechSynthesis.getVoices();
         }
     });
 
-    API.isAllFriendsRetrived = function (flag) {
+    API.refreshFriends = async function () {
-        if (flag) {
+        var onlineFriends = await this.refreshOnlineFriends();
-            for (var id of this.currentUser.friends) {
+        var offlineFriends = await this.refreshOfflineFriends();
-                if (this.friends200.has(id) === false) {
+        return onlineFriends.concat(offlineFriends);
-                    var n = this.friends404.get(id) || 0;
-                    if (n < 2) {
-                        this.friends404.set(id, n + 1);
-                    }
-                }
-            }
-        } else {
-            for (var id of this.currentUser.friends) {
-                if (this.friends200.has(id) === false ||
-                    this.friends404.get(id) < 2) {
-                    return false;
-                }
-            }
-        }
-        return true;
     };
 
-    API.refreshFriends = function () {
+    API.refreshOnlineFriends = async function () {
+        var friends = [];
         var params = {
             n: 50,
             offset: 0,
             offline: false
         };
-        var N = this.currentUser.onlineFriends.length;
+        var N = this.currentUser.onlineFriends.length + this.currentUser.activeFriends.length;
-        if (N === 0) {
+        var count = Math.trunc(N / 50);
-            N = this.currentUser.friends.length;
+        for (var i = count; i > -1; i--) {
-            if (N === 0 ||
+            var args = await this.getFriends(params);
-                this.isAllFriendsRetrived(false)) {
+            friends = friends.concat(args.json);
-                return;
+            params.offset += 50;
-            }
-            params.offline = true;
         }
-        if (this.isFriendsLoading) {
+        return friends;
-            return;
+    };
+
+    API.refreshOfflineFriends = async function () {
+        var friends = [];
+        var params = {
+            n: 50,
+            offset: 0,
+            offline: true
+        };
+        var onlineCount = this.currentUser.onlineFriends.length + this.currentUser.activeFriends.length;
+        var N = this.currentUser.friends.length - onlineCount;
+        var count = Math.trunc(N / 50);
+        for (var i = count; i > -1; i--) {
+            var args = await this.getFriends(params);
+            friends = friends.concat(args.json);
+            params.offset += 50;
         }
-        this.isFriendsLoading = true;
+        return friends;
-        this.bulk({
-            fn: 'getFriends',
-            N,
-            params,
-            done(ok, options) {
-                if (this.isAllFriendsRetrived(params.offline)) {
-                    this.isFriendsLoading = false;
-                    return;
-                }
-                var { length } = this.currentUser.friends;
-                options.N = length - params.offset;
-                if (options.N <= 0) {
-                    options.N = length;
-                }
-                params.offset = 0;
-                params.offline = true;
-                this.bulk(options);
-            }
-        });
     };
 
     /*
@@ -3970,14 +3948,14 @@ speechSynthesis.getVoices();
                 if (ctx.created_at < bias) {
                     break;
                 }
-                if ((ctx.type === 'GPS') && (ctx.location[0] === this.lastLocation.location)) {
+                if ((ctx.type === 'GPS') && (ctx.location === this.lastLocation.location)) {
                     if (joiningMap[ctx.displayName]) {
                         continue;
                     }
                     joiningMap[ctx.displayName] = ctx.created_at;
                     if (API.cachedUsers.has(ctx.userId)) {
                         var user = API.cachedUsers.get(ctx.userId);
-                        if (ctx.location[0] !== user.location) {
+                        if (ctx.location !== user.location) {
                             continue;
                         }
                     }
@@ -4302,7 +4280,7 @@ speechSynthesis.getVoices();
             }
             // hide private worlds from feeds
             if ((this.hidePrivateFromFeed) &&
-                (ctx.type === 'GPS') && (ctx.location[0] === 'private')) {
+                (ctx.type === 'GPS') && (ctx.location === 'private')) {
                 continue;
             }
             var isFriend = this.friends.has(ctx.userId);
@@ -4592,7 +4570,7 @@ speechSynthesis.getVoices();
         }
     };
 
-    $app.methods.playNotyTTS = async function (noty, message) {
+    $app.methods.playNotyTTS = function (noty, message) {
         switch (noty.type) {
             case 'OnPlayerJoined':
                 this.speak(`${noty.data} has joined`);
@@ -4604,7 +4582,7 @@ speechSynthesis.getVoices();
                 this.speak(`${noty.displayName} is joining`);
                 break;
             case 'GPS':
-                this.speak(`${noty.displayName} is in ${await this.displayLocation(noty.location[0])}`);
+                this.speak(`${noty.displayName} is in ${this.displayLocation(noty.location, noty.worldName)}`);
                 break;
             case 'Online':
                 this.speak(`${noty.displayName} has logged in`);
@@ -4613,7 +4591,7 @@ speechSynthesis.getVoices();
                 this.speak(`${noty.displayName} has logged out`);
                 break;
             case 'Status':
-                this.speak(`${noty.displayName} status is now ${noty.status[0].status} ${noty.status[0].statusDescription}`);
+                this.speak(`${noty.displayName} status is now ${noty.status} ${noty.statusDescription}`);
                 break;
             case 'invite':
                 this.speak(`${noty.senderUsername} has invited you to ${noty.details.worldName}${message}`);
@@ -4668,7 +4646,7 @@ speechSynthesis.getVoices();
         }
     };
 
-    $app.methods.displayXSNotification = async function (noty, message, image) {
+    $app.methods.displayXSNotification = function (noty, message, image) {
         var timeout = parseInt(parseInt(this.notificationTimeout) / 1000);
         switch (noty.type) {
             case 'OnPlayerJoined':
@@ -4681,7 +4659,7 @@ speechSynthesis.getVoices();
                 AppApi.XSNotification('VRCX', `${noty.displayName} is joining`, timeout, image);
                 break;
             case 'GPS':
-                AppApi.XSNotification('VRCX', `${noty.displayName} is in ${await this.displayLocation(noty.location[0])}`, timeout, image);
+                AppApi.XSNotification('VRCX', `${noty.displayName} is in ${this.displayLocation(noty.location, noty.worldName)}`, timeout, image);
                 break;
             case 'Online':
                 AppApi.XSNotification('VRCX', `${noty.displayName} has logged in`, timeout, image);
@@ -4690,7 +4668,7 @@ speechSynthesis.getVoices();
                 AppApi.XSNotification('VRCX', `${noty.displayName} has logged out`, timeout, image);
                 break;
             case 'Status':
-                AppApi.XSNotification('VRCX', `${noty.displayName} status is now ${noty.status[0].status} ${noty.status[0].statusDescription}`, timeout, image);
+                AppApi.XSNotification('VRCX', `${noty.displayName} status is now ${noty.status} ${noty.statusDescription}`, timeout, image);
                 break;
             case 'invite':
                 AppApi.XSNotification('VRCX', `${noty.senderUsername} has invited you to ${noty.details.worldName}${message}`, timeout, image);
@@ -4745,7 +4723,7 @@ speechSynthesis.getVoices();
         }
     };
 
-    $app.methods.displayDesktopToast = async function (noty, message, image) {
+    $app.methods.displayDesktopToast = function (noty, message, image) {
         switch (noty.type) {
             case 'OnPlayerJoined':
                 AppApi.DesktopNotification(noty.data, 'has joined', image);
@@ -4757,7 +4735,7 @@ speechSynthesis.getVoices();
                 AppApi.DesktopNotification(noty.displayName, 'is joining', image);
                 break;
             case 'GPS':
-                AppApi.DesktopNotification(noty.displayName, `is in ${await this.displayLocation(noty.location[0])}`, image);
+                AppApi.DesktopNotification(noty.displayName, `is in ${this.displayLocation(noty.location, noty.worldName)}`, image);
                 break;
             case 'Online':
                 AppApi.DesktopNotification(noty.displayName, 'has logged in', image);
@@ -4766,7 +4744,7 @@ speechSynthesis.getVoices();
                 AppApi.DesktopNotification(noty.displayName, 'has logged out', image);
                 break;
             case 'Status':
-                AppApi.DesktopNotification(noty.displayName, `status is now ${noty.status[0].status} ${noty.status[0].statusDescription}`, image);
+                AppApi.DesktopNotification(noty.displayName, `status is now ${noty.status} ${noty.statusDescription}`, image);
                 break;
             case 'invite':
                 AppApi.DesktopNotification(noty.senderUsername, `has invited you to ${noty.details.worldName}${message}`, image);
@@ -4821,7 +4799,7 @@ speechSynthesis.getVoices();
         }
     };
 
-    $app.methods.displayLocation = async function (location) {
+    $app.methods.displayLocation = function (location, worldName) {
         var text = '';
         var L = API.parseLocation(location);
         if (L.isOffline) {
@@ -4829,23 +4807,10 @@ speechSynthesis.getVoices();
         } else if (L.isPrivate) {
             text = 'Private';
         } else if (L.worldId) {
-            var ref = API.cachedWorlds.get(L.worldId);
+            if (L.instanceId) {
-            if (typeof ref === 'undefined') {
+                text = `${worldName} ${L.accessType}`;
-                await API.getWorld({
-                    worldId: L.worldId
-                }).then((args) => {
-                    if (L.tag === location) {
-                        if (L.instanceId) {
-                            text = `${args.json.name} ${L.accessType}`;
-                        } else {
-                            text = args.json.name;
-                        }
-                    }
-                });
-            } else if (L.instanceId) {
-                text = `${ref.name} ${L.accessType}`;
             } else {
-                text = ref.name;
+                text = worldName;
             }
         }
         return text;
@@ -5301,17 +5266,40 @@ speechSynthesis.getVoices();
         }
     };
 
-    $app.methods.loadMemo = function (id) {
+    $app.methods.migrateMemos = async function () {
-        var key = `memo_${id}`;
+        var json = JSON.parse(VRCXStorage.GetAll());
-        return VRCXStorage.Get(key);
+        database.begin();
+        for (var line in json) {
+            if (line.substring(0, 8) === 'memo_usr') {
+                var userId = line.substring(5);
+                var memo = json[line];
+                if (memo) {
+                    await this.saveMemo(userId, memo);
+                    VRCXStorage.Remove(`memo_${userId}`);
+                }
+            }
+        }
+        database.commit();
+    };
+
+    $app.methods.loadMemo = async function (userId) {
+        try {
+            var row = await database.getMemo(userId);
+            return row.memo;
+        } catch (err) {
+        }
+        return '';
     };
 
     $app.methods.saveMemo = function (id, memo) {
-        var key = `memo_${id}`;
         if (memo) {
-            VRCXStorage.Set(key, String(memo));
+            database.setMemo({
+                userId: id,
+                editedAt: new Date().toJSON(),
+                memo
+            });
         } else {
-            VRCXStorage.Remove(key);
+            database.deleteMemo(id);
         }
         var ref = this.friends.get(id);
         if (ref) {
@@ -5422,7 +5410,6 @@ speechSynthesis.getVoices();
     });
 
     API.$on('USER:CURRENT', function (args) {
-        // initFriendship()이 LOGIN에서 처리되기 때문에
         // USER:CURRENT에서 처리를 함
         $app.refreshFriends(args.ref, args.origin);
     });
@@ -5495,10 +5482,13 @@ speechSynthesis.getVoices();
             ref,
             name: '',
             no: ++this.friendsNo,
-            memo: this.loadMemo(id)
+            memo: ''
         };
+        this.loadMemo(id).then((memo) => {
+            ctx.memo = memo;
+        });
         if (typeof ref === 'undefined') {
-            ref = this.friendLog[id];
+            ref = this.friendLog.get(id);
             if (typeof ref !== 'undefined' &&
                 ref.displayName) {
                 ctx.name = ref.displayName;
@@ -5677,18 +5667,35 @@ speechSynthesis.getVoices();
                     if (ctx.state === 'online') {
                         var ts = Date.now();
                         var time = ts - $location_at;
-                        this.addFeed('Offline', ctx.ref, {
+                        var worldName = await this.getWorldName(location);
-                            location: (location === 'offline') ? '' : location,
+                        var feed = {
+                            created_at: new Date().toJSON(),
+                            type: 'Offline',
+                            userId: ctx.ref.id,
+                            displayName: ctx.ref.displayName,
+                            location,
+                            worldName,
                             time
-                        });
+                        };
+                        this.addFeed(feed);
+                        database.addOnlineOfflineToDatabase(feed);
                     }
                 } else if (newState === 'online') {
                     ctx.ref.$location_at = Date.now();
                     ctx.ref.$online_for = Date.now();
                     ctx.ref.$offline_for = '';
-                    this.addFeed('Online', ctx.ref, {
+                    var worldName = await this.getWorldName(ctx.ref.location);
-                        location: ctx.ref.location
+                    var feed = {
-                    });
+                        created_at: new Date().toJSON(),
+                        type: 'Online',
+                        userId: ctx.ref.id,
+                        displayName: ctx.ref.displayName,
+                        location,
+                        worldName,
+                        time: ''
+                    };
+                    this.addFeed(feed);
+                    database.addOnlineOfflineToDatabase(feed);
                 }
             }
             if (ctx.state === 'online') {
@@ -5740,6 +5747,23 @@ speechSynthesis.getVoices();
         this.updateFriendInProgress.delete(id);
     };
 
+    $app.methods.getWorldName = async function (location) {
+        var worldName = '';
+        if (location !== 'offline') {
+            try {
+                var L = API.parseLocation(location);
+                if (L.worldId) {
+                var args = await API.getCachedWorld({
+                    worldId: L.worldId
+                });
+                worldName = args.ref.name;
+                }
+            } catch (err) {
+            }
+        }
+        return worldName;
+    };
+
     $app.methods.updateFriendGPS = function (userId) {
         if (!this.orderFriendsGroupGPS) {
             return;
@@ -5930,6 +5954,26 @@ speechSynthesis.getVoices();
         return style;
     };
 
+    $app.methods.statusClass = function (status) {
+        var style = {};
+        if (typeof status !== 'undefined') {
+            if (status === 'active') {
+                // Online
+                style.online = true;
+            } else if (status === 'join me') {
+                // Join Me
+                style.joinme = true;
+            } else if (status === 'ask me') {
+                // Ask Me
+                style.askme = true;
+            } else if (status === 'busy') {
+                // Do Not Disturb
+                style.busy = true;
+            }
+        }
+        return style;
+    };
+
     $app.methods.confirmDeleteFriend = function (id) {
         this.$confirm('Continue? Unfriend', 'Confirm', {
             confirmButtonText: 'Confirm',
@@ -6075,12 +6119,25 @@ speechSynthesis.getVoices();
         $app.data.feedTable.filters[0].value = JSON.parse(configRepository.getString('VRCX_feedTableFilters'));
     }
 
-    API.$on('LOGIN', function (args) {
+    API.$on('LOGIN', async function (args) {
-        $app.feedTable.data = VRCXStorage.GetArray(`${args.ref.id}_feedTable`);
+        $app.friendLogInitStatus = false;
+        await database.init(args.json.id);
+        $app.feedTable.data = await database.getFeedDatabase();
         $app.sweepFeed();
+        if (configRepository.getBool(`friendLogInit_${args.json.id}`)) {
+            $app.getFriendLog();
+        } else {
+            $app.initFriendLog();
+        }
+        //remove old data from json file and migrate to SQLite
+        if (VRCXStorage.Get(`${args.json.id}_friendLogUpdatedAt`)) {
+            VRCXStorage.Remove(`${args.json.id}_feedTable`);
+            $app.migrateMemos();
+            $app.migrateFriendLog(args.json.id);
+        }
     });
 
-    API.$on('USER:UPDATE', function (args) {
+    API.$on('USER:UPDATE', async function (args) {
         var { ref, props } = args;
         if ($app.friends.has(ref.id) === false) {
             return;
@@ -6090,85 +6147,111 @@ speechSynthesis.getVoices();
             (props.location[0] !== '') &&
             (props.location[1] !== 'offline') &&
             (props.location[1] !== '')) {
-            $app.addFeed('GPS', ref, {
+            var worldName = await $app.getWorldName(props.location[0]);
-                location: [
+            var feed = {
-                    props.location[0],
+                created_at: new Date().toJSON(),
-                    props.location[1]
+                type: 'GPS',
-                ],
+                userId: ref.id,
+                displayName: ref.displayName,
+                location: props.location[0],
+                worldName,
+                previousLocation: props.location[1],
                 time: props.location[2]
-            });
+            };
+            $app.addFeed(feed);
+            database.addGPSToDatabase(feed);
             $app.updateFriendGPS(ref.id);
-            $app.feedDownloadWorldCache(ref);
+            $app.feedDownloadWorldCache(ref.id, props.location[0]);
         }
         if (props.currentAvatarImageUrl ||
             props.currentAvatarThumbnailImageUrl) {
-            $app.addFeed('Avatar', ref, {
+            var currentAvatarImageUrl = '';
-                avatar: [
+            var previousCurrentAvatarImageUrl = '';
-                    {
+            var currentAvatarThumbnailImageUrl = '';
-                        currentAvatarImageUrl: props.currentAvatarImageUrl
+            var previousCurrentAvatarThumbnailImageUrl = '';
-                            ? props.currentAvatarImageUrl[0]
+            if (props.currentAvatarImageUrl) {
-                            : ref.currentAvatarImageUrl,
+                currentAvatarImageUrl = props.currentAvatarImageUrl[0];
-                        currentAvatarThumbnailImageUrl: props.currentAvatarThumbnailImageUrl
+                previousCurrentAvatarImageUrl = props.currentAvatarImageUrl[1];
-                            ? props.currentAvatarThumbnailImageUrl[0]
+            } else {
-                            : ref.currentAvatarThumbnailImageUrl
+                currentAvatarImageUrl = ref.currentAvatarImageUrl;
-                    },
+                previousCurrentAvatarImageUrl = ref.currentAvatarImageUrl;
-                    {
+            }
-                        currentAvatarImageUrl: props.currentAvatarImageUrl
+            if (props.currentAvatarThumbnailImageUrl) {
-                            ? props.currentAvatarImageUrl[1]
+                currentAvatarThumbnailImageUrl = props.currentAvatarThumbnailImageUrl[0];
-                            : ref.currentAvatarImageUrl,
+                previousCurrentAvatarThumbnailImageUrl = props.currentAvatarThumbnailImageUrl[1];
-                        currentAvatarThumbnailImageUrl: props.currentAvatarThumbnailImageUrl
+            } else {
-                            ? props.currentAvatarThumbnailImageUrl[1]
+                currentAvatarThumbnailImageUrl = ref.currentAvatarThumbnailImageUrl;
-                            : ref.currentAvatarThumbnailImageUrl
+                previousCurrentAvatarThumbnailImageUrl = ref.currentAvatarThumbnailImageUrl;
-                    }
+            }
-                ]
+            var avatarInfo = {
-            });
+                ownerId: '',
+                avatarName: ''
+            }
+            try {
+                avatarInfo = await $app.getAvatarName(currentAvatarImageUrl);
+            } catch (err) {
+            }
+            var feed = {
+                created_at: new Date().toJSON(),
+                type: 'Avatar',
+                userId: ref.id,
+                displayName: ref.displayName,
+                ownerId: avatarInfo.ownerId,
+                avatarName: avatarInfo.avatarName,
+                currentAvatarImageUrl,
+                currentAvatarThumbnailImageUrl,
+                previousCurrentAvatarImageUrl,
+                previousCurrentAvatarThumbnailImageUrl
+            };
+            $app.addFeed(feed);
+            database.addAvatarToDatabase(feed);
         }
         if (props.status ||
             props.statusDescription) {
-            $app.addFeed('Status', ref, {
+            var status = '';
-                status: [
+            var previousStatus = '';
-                    {
+            var statusDescription = '';
-                        status: props.status
+            var previousStatusDescription = '';
-                            ? props.status[0]
+            if (props.status) {
-                            : ref.status,
+                if (props.status[0]) {
-                        statusDescription: props.statusDescription
+                    status = props.status[0];
-                            ? props.statusDescription[0]
+                }
-                            : ref.statusDescription
+                if (props.status[1]) {
-                    },
+                    previousStatus = props.status[1];
-                    {
+                }
-                        status: props.status
+            } else if (ref.status) {
-                            ? props.status[1]
+                status = ref.status;
-                            : ref.status,
+                previousStatus = ref.status;
-                        statusDescription: props.statusDescription
+            }
-                            ? props.statusDescription[1]
+            if (props.statusDescription) {
-                            : ref.statusDescription
+                if (props.statusDescription[0]) {
-                    }
+                    statusDescription = props.statusDescription[0];
-                ]
+                }
-            });
+                if (props.statusDescription[1]) {
+                    previousStatusDescription = props.statusDescription[1];
+                }
+            } else if (ref.statusDescription) {
+                statusDescription = ref.statusDescription;
+                previousStatusDescription = ref.statusDescription;
+            }
+            var feed = {
+                created_at: new Date().toJSON(),
+                type: 'Status',
+                userId: ref.id,
+                displayName: ref.displayName,
+                status,
+                statusDescription,
+                previousStatus,
+                previousStatusDescription
+            };
+            $app.addFeed(feed);
+            database.addStatusToDatabase(feed);
         }
     });
 
-    var saveFeedTimer = null;
+    $app.methods.addFeed = function (feed) {
-    $app.methods.saveFeed = function () {
+        this.feedTable.data.push(feed);
-        if (saveFeedTimer !== null) {
-            return;
-        }
-        saveFeedTimer = setTimeout(() => {
-            saveFeedTimer = null;
-            VRCXStorage.SetArray(`${API.currentUser.id}_feedTable`, this.feedTable.data);
-        }, 1);
-    };
-
-    $app.methods.addFeed = function (type, ref, extra) {
-        this.feedTable.data.push({
-            created_at: new Date().toJSON(),
-            type,
-            userId: ref.id,
-            displayName: ref.displayName,
-            ...extra
-        });
         this.sweepFeed();
-        this.saveFeed();
         this.updateSharedFeed(false);
         this.notifyMenu('feed');
     };
@@ -6761,7 +6844,7 @@ speechSynthesis.getVoices();
                 if (type === 'friend') {
                     var ref = API.cachedUsers.get(objectId);
                     if (typeof ref === 'undefined') {
-                        ref = this.friendLog[objectId];
+                        ref = this.friendLog.get(objectId);
                         if (typeof ref !== 'undefined' &&
                             ref.displayName) {
                             ctx.name = ref.displayName;
@@ -6941,7 +7024,7 @@ speechSynthesis.getVoices();
 
     // App: friendLog
 
-    $app.data.friendLog = {};
+    $app.data.friendLog = new Map();
     $app.data.friendLogTable = {
         data: [],
         filters: [
@@ -6976,10 +7059,6 @@ speechSynthesis.getVoices();
         }
     };
 
-    API.$on('LOGIN', function (args) {
-        $app.initFriendship(args.ref);
-    });
-
     API.$on('USER:CURRENT', function (args) {
         $app.updateFriendships(args.ref);
     });
@@ -7001,13 +7080,14 @@ speechSynthesis.getVoices();
         if (typeof ref === 'undefined') {
             return;
         }
-        $app.friendLogTable.data.push({
+        var friendLogHistory = {
             created_at: new Date().toJSON(),
             type: 'FriendRequest',
             userId: ref.id,
             displayName: ref.displayName
-        });
+        };
-        $app.saveFriendLog();
+        $app.friendLogTable.data.push(friendLogHistory);
+        database.addFriendLogHistory(friendLogHistory);
     });
 
     API.$on('FRIEND:REQUEST:CANCEL', function (args) {
@@ -7015,56 +7095,80 @@ speechSynthesis.getVoices();
         if (typeof ref === 'undefined') {
             return;
         }
-        $app.friendLogTable.data.push({
+        var friendLogHistory = {
             created_at: new Date().toJSON(),
             type: 'CancelFriendRequst',
             userId: ref.id,
             displayName: ref.displayName
-        });
+        };
-        $app.saveFriendLog();
+        $app.friendLogTable.data.push(friendLogHistory);
+        database.addFriendLogHistory(friendLogHistory);
     });
 
-    var saveFriendLogTimer = null;
+    $app.data.friendLogInitStatus = false;
-    $app.methods.saveFriendLog = function () {
+
-        if (saveFriendLogTimer !== null) {
+    $app.methods.initFriendLog = async function () {
+        if (this.friendLogInitStatus) {
             return;
         }
-        this.updateSharedFeed(true);
+        if (configRepository.getBool(`friendLogInit_${API.currentUser.id}`)) {
-        saveFriendLogTimer = setTimeout(() => {
+            this.friendLogInitStatus = true;
-            saveFriendLogTimer = null;
+            return;
-            VRCXStorage.SetObject(`${API.currentUser.id}_friendLog`, this.friendLog);
+        }
-            VRCXStorage.SetArray(`${API.currentUser.id}_friendLogTable`, this.friendLogTable.data);
+        var sqlValues = [];
-            VRCXStorage.Set(`${API.currentUser.id}_friendLogUpdatedAt`, new Date().toJSON());
+        var friends = await API.refreshFriends();
-        }, 1);
+        for (var friend of friends) {
+            var ref = API.applyUser(friend);
+            var row = {
+                userId: ref.id,
+                displayName: ref.displayName,
+                trustLevel: ref.$trustLevel
+            };
+            this.friendLog.set(friend.id, row);
+            sqlValues.unshift(row);
+        }
+        database.setFriendLogCurrentArray(sqlValues);
+        configRepository.setBool(`friendLogInit_${API.currentUser.id}`, true);
+        this.friendLogInitStatus = true;
     };
 
-    $app.methods.initFriendship = function (ref) {
+    $app.methods.migrateFriendLog = function (userId) {
-        if (VRCXStorage.Get(`${ref.id}_friendLogUpdatedAt`)) {
+        VRCXStorage.Remove(`${userId}_friendLogUpdatedAt`);
-            this.friendLog = VRCXStorage.GetObject(`${ref.id}_friendLog`);
+        this.friendLog = new Map();
-            this.friendLogTable.data = VRCXStorage.GetArray(`${ref.id}_friendLogTable`);
+        var oldFriendLog = VRCXStorage.GetObject(`${userId}_friendLog`);
-        } else {
+        var friendLogCurrentValues = [];
-            var friendLog = {};
+        for (var i in oldFriendLog) {
-            for (var id of ref.friends) {
+            var friend = oldFriendLog[i];
-                // DO NOT set displayName,
+            var row = {
-                // it's flag about it's new friend
+                userId: friend.id,
-                var ctx = {
+                displayName: friend.displayName,
-                    id
+                trustLevel: friend.trustLevel
-                };
+            };
-                var user = API.cachedUsers.get(id);
+            this.friendLog.set(friend.id, row);
-                if (typeof user !== 'undefined') {
+            friendLogCurrentValues.unshift(row);
-                    ctx.displayName = user.displayName;
-                    ctx.trustLevel = user.$trustLevel;
-                }
-                friendLog[id] = ctx;
-            }
-            this.friendLog = friendLog;
-            this.friendLogTable.data = [];
-            this.saveFriendLog();
         }
+        database.setFriendLogCurrentArray(friendLogCurrentValues);
+        VRCXStorage.Remove(`${userId}_friendLog`);
+        this.friendLogTable.data = VRCXStorage.GetArray(`${userId}_friendLogTable`);
+        database.addFriendLogHistoryArray(this.friendLogTable.data);
+        VRCXStorage.Remove(`${userId}_friendLogTable`);
+        configRepository.setBool(`friendLogInit_${API.currentUser.id}`, true);
+        this.friendLogInitStatus = true;
+    };
+
+    $app.methods.getFriendLog = async function () {
+        this.friendLog = new Map();
+        var friendLogCurrentArray = await database.getFriendLogCurrent();
+        for (var friend of friendLogCurrentArray) {
+            this.friendLog.set(friend.userId, friend);
+        }
+        this.friendLogTable.data = [];
+        this.friendLogTable.data = await database.getFriendLogHistory();
+        this.friendLogInitStatus = true;
     };
 
     $app.methods.addFriendship = function (id) {
-        if (typeof this.friendLog[id] !== 'undefined') {
+        if ((!this.friendLogInitStatus) || (this.friendLog.has(id))) {
             return;
         }
         var ctx = {
@@ -7072,35 +7176,45 @@ speechSynthesis.getVoices();
             displayName: null,
             trustLevel: null
         };
-        Vue.set(this.friendLog, id, ctx);
         var ref = API.cachedUsers.get(id);
         if (typeof ref !== 'undefined') {
             ctx.displayName = ref.displayName;
             ctx.trustLevel = ref.$trustLevel;
-            this.friendLogTable.data.push({
+            var friendLogHistory = {
                 created_at: new Date().toJSON(),
                 type: 'Friend',
-                userId: ref.id,
+                userId: id,
                 displayName: ctx.displayName
-            });
+            };
+            this.friendLogTable.data.push(friendLogHistory);
+            database.addFriendLogHistory(friendLogHistory);
+
+            var friendLogCurrent = {
+                userId: id,
+                displayName: ctx.displayName,
+                trustLevel: ctx.trustLevel
+            };
+            this.friendLog.set(id, friendLogCurrent);
+            database.setFriendLogCurrent(friendLogCurrent);
         }
-        this.saveFriendLog();
         this.notifyMenu('friendLog');
     };
 
     $app.methods.deleteFriendship = function (id) {
-        var ctx = this.friendLog[id];
+        var ctx = this.friendLog.get(id);
         if (typeof ctx === 'undefined') {
             return;
         }
-        Vue.delete(this.friendLog, id);
+        var friendLogHistory = {
-        this.friendLogTable.data.push({
             created_at: new Date().toJSON(),
             type: 'Unfriend',
             userId: id,
             displayName: ctx.displayName
-        });
+        };
-        this.saveFriendLog();
+        this.friendLogTable.data.push(friendLogHistory);
+        database.addFriendLogHistory(friendLogHistory);
+        this.friendLog.delete(id);
+        database.deleteFriendLogCurrent(id);
         this.notifyMenu('friendLog');
     };
 
@@ -7118,46 +7232,64 @@ speechSynthesis.getVoices();
     };
 
     $app.methods.updateFriendship = function (ref) {
-        var ctx = this.friendLog[ref.id];
+        var ctx = this.friendLog.get(ref.id);
-        if (typeof ctx === 'undefined') {
+        if ((!this.friendLogInitStatus) || (typeof ctx === 'undefined')) {
             return;
         }
         if (ctx.displayName !== ref.displayName) {
             if (ctx.displayName) {
-                this.friendLogTable.data.push({
+                var friendLogHistory = {
                     created_at: new Date().toJSON(),
                     type: 'DisplayName',
                     userId: ref.id,
                     displayName: ref.displayName,
                     previousDisplayName: ctx.displayName
-                });
+                };
+                this.friendLogTable.data.push(friendLogHistory);
+                database.addFriendLogHistory(friendLogHistory);
             } else if (ctx.displayName === null) {
-                this.friendLogTable.data.push({
+                var friendLogHistory = {
                     created_at: new Date().toJSON(),
                     type: 'Friend',
                     userId: ref.id,
                     displayName: ref.displayName
-                });
+                };
+                this.friendLogTable.data.push(friendLogHistory);
+                database.addFriendLogHistory(friendLogHistory);
             }
+            var friendLogCurrent = {
+                userId: ref.id,
+                displayName: ref.displayName,
+                trustLevel: ref.$trustLevel
+            };
+            this.friendLog.set(ref.id, friendLogCurrent);
+            database.setFriendLogCurrent(friendLogCurrent);
             ctx.displayName = ref.displayName;
-            this.saveFriendLog();
             this.notifyMenu('friendLog');
         }
         if (ref.$trustLevel &&
             ctx.trustLevel !== ref.$trustLevel) {
             if ((ctx.trustLevel) &&
                 (ctx.trustLevel !== 'Legendary User') && (ctx.trustLevel !== 'VRChat Team') && (ctx.trustLevel !== 'Nuisance')) { // TODO: remove
-                this.friendLogTable.data.push({
+                var friendLogHistory = {
                     created_at: new Date().toJSON(),
                     type: 'TrustLevel',
                     userId: ref.id,
                     displayName: ref.displayName,
                     trustLevel: ref.$trustLevel,
                     previousTrustLevel: ctx.trustLevel
-                });
+                };
+                this.friendLogTable.data.push(friendLogHistory);
+                database.addFriendLogHistory(friendLogHistory);
+                var friendLogCurrent = {
+                    userId: ref.id,
+                    displayName: ref.displayName,
+                    trustLevel: ref.$trustLevel
+                };
+                this.friendLog.set(ref.id, friendLogCurrent);
+                database.setFriendLogCurrent(friendLogCurrent);
             }
             ctx.trustLevel = ref.$trustLevel;
-            this.saveFriendLog();
             this.notifyMenu('friendLog');
         }
     };
@@ -7171,7 +7303,7 @@ speechSynthesis.getVoices();
             callback: (action) => {
                 if (action === 'confirm' &&
                     removeFromArray(this.friendLogTable.data, row)) {
-                    this.saveFriendLog();
+                    database.deleteFriendLogHistory(row.rowId);
                 }
             }
         });
@@ -8489,7 +8621,13 @@ speechSynthesis.getVoices();
         D.userIcon = '';
         D.id = userId;
         D.treeData = [];
-        D.memo = this.loadMemo(userId);
+        this.loadMemo(userId).then((memo) => {
+            D.memo = memo;
+            var ref = this.friends.get(userId);
+            if (ref) {
+                ref.memo = String(memo || '');
+            }
+        });
         D.visible = true;
         D.loading = true;
         D.avatars = [];
@@ -12450,18 +12588,18 @@ speechSynthesis.getVoices();
         }
     };
 
-    $app.methods.feedDownloadWorldCache = function (feed) {
+    $app.methods.feedDownloadWorldCache = function (id, location) {
         if ((this.worldAutoCacheGPS === 'Always') ||
             ((this.worldAutoCacheGPS === 'Game Closed') && (!this.isGameRunning)) ||
             ((this.worldAutoCacheGPS === 'Game Running') && (this.isGameRunning))) {
-            if ((feed.location === '') ||
+            if ((location === '') ||
-                (feed.location === 'offline') ||
+                (location === 'offline') ||
-                (feed.location === 'private') ||
+                (location === 'private') ||
                 ((!this.worldAutoCacheGPSFilter) &&
-                    (!API.cachedFavoritesByObjectId.has(feed.id)))) {
+                    (!API.cachedFavoritesByObjectId.has(id)))) {
                 return;
             }
-            this.autoDownloadWorldCache(feed.location, 'GPS', feed.id);
+            this.autoDownloadWorldCache(location, 'GPS', id);
         }
     };
 

html/src/index.pug

@@ -87,61 +87,49 @@ html
                         template(v-once #default="scope")
                             div(style="position:relative;font-size:14px")
                                 template(v-if="scope.row.type === 'GPS'")
-                                    location(v-if="scope.row.location[1]" :location="scope.row.location[1]")
+                                    location(v-if="scope.row.previousLocation" :location="scope.row.previousLocation")
                                     el-tag(type="info" effect="plain" size="mini" style="margin-left:5px") {{ scope.row.time | timeToText }}
                                     br
                                     span
-                                            i.el-icon-right
+                                        i.el-icon-right
-                                    location(v-if="scope.row.location[0]" :location="scope.row.location[0]")
+                                    location(v-if="scope.row.location" :location="scope.row.location" :hint="scope.row.worldName")
                                 template(v-else-if="scope.row.type === 'Offline'")
                                     template(v-if="scope.row.location")
-                                        location(:location="scope.row.location")
+                                        location(:location="scope.row.location" :hint="scope.row.worldName")
                                         el-tag(type="info" effect="plain" size="mini" style="margin-left:5px") {{ scope.row.time | timeToText }}
                                 template(v-else-if="scope.row.type === 'Online'")
-                                    location(v-if="scope.row.location" :location="scope.row.location")
+                                    location(v-if="scope.row.location" :location="scope.row.location" :hint="scope.row.worldName")
                                 template(v-else-if="scope.row.type === 'Avatar'")
-                                    template(v-if="scope.row.avatar[0] === Object(scope.row.avatar[0])")
+                                    el-popover(placement="right" width="500px" trigger="click")
-                                        //- high resolution (v2) 2020.07.12~
+                                        img.x-link(slot="reference" v-lazy="scope.row.previousCurrentAvatarThumbnailImageUrl" style="flex:none;width:160px;height:120px;border-radius:4px")
-                                        el-popover(placement="right" width="500px" trigger="click")
+                                        img.x-link(v-lazy="scope.row.previousCurrentAvatarImageUrl" style="width:500px;height:375px" @click="showAvatarAuthorDialog(scope.row.userId, scope.row.previousCurrentAvatarImageUrl)")
-                                            img.x-link(slot="reference" v-lazy="scope.row.avatar[1].currentAvatarThumbnailImageUrl" style="flex:none;width:160px;height:120px;border-radius:4px")
+                                    span(style="position:relative;top:-50px;margin:0 5px")
-                                            img.x-link(v-lazy="scope.row.avatar[1].currentAvatarImageUrl" style="width:500px;height:375px" @click="showAvatarAuthorDialog(scope.row.userId, scope.row.avatar[1].currentAvatarImageUrl)")
+                                        i.el-icon-right
-                                        span(style="position:relative;top:-50px;margin:0 5px")
+                                    el-popover(placement="right" width="500px" trigger="click")
-                                            i.el-icon-right
+                                        img.x-link(slot="reference" v-lazy="scope.row.currentAvatarThumbnailImageUrl" style="flex:none;width:160px;height:120px;border-radius:4px")
-                                        el-popover(placement="right" width="500px" trigger="click")
+                                        img.x-link(v-lazy="scope.row.currentAvatarImageUrl" style="width:500px;height:375px" @click="showAvatarAuthorDialog(scope.row.userId, scope.row.currentAvatarImageUrl)")
-                                            img.x-link(slot="reference" v-lazy="scope.row.avatar[0].currentAvatarThumbnailImageUrl" style="flex:none;width:160px;height:120px;border-radius:4px")
-                                            img.x-link(v-lazy="scope.row.avatar[0].currentAvatarImageUrl" style="width:500px;height:375px" @click="showAvatarAuthorDialog(scope.row.userId, scope.row.avatar[0].currentAvatarImageUrl)")
-                                    template(v-else)
-                                        //- legacy
-                                        el-popover(placement="right" width="500px" trigger="click")
-                                            img.x-link(slot="reference" v-lazy="scope.row.avatar[1]" style="flex:none;width:160px;height:120px;border-radius:4px")
-                                            img.x-link(v-lazy="scope.row.avatar[1]" style="width:500px;height:375px" @click="openExternalLink(scope.row.avatar[1])")
-                                        span(style="position:relative;top:-50px;margin:0 5px")
-                                            i.el-icon-right
-                                        el-popover(placement="right" width="500px" trigger="click")
-                                            img.x-link(slot="reference" v-lazy="scope.row.avatar[0]" style="flex:none;width:160px;height:120px;border-radius:4px")
-                                            img.x-link(v-lazy="scope.row.avatar[0]" style="width:500px;height:375px" @click="openExternalLink(scope.row.avatar[0])")
                                 template(v-else-if="scope.row.type === 'Status'")
                                     el-tooltip(placement="top")
                                         template(#content)
-                                            span(v-if="scope.row.status[1].status === 'active'") Active
+                                            span(v-if="scope.row.previousStatus === 'active'") Active
-                                            span(v-else-if="scope.row.status[1].status === 'join me'") Join Me
+                                            span(v-else-if="scope.row.previousStatus === 'join me'") Join Me
-                                            span(v-else-if="scope.row.status[1].status === 'ask me'") Ask Me
+                                            span(v-else-if="scope.row.previousStatus === 'ask me'") Ask Me
-                                            span(v-else-if="scope.row.status[1].status === 'busy'") Do Not Disturb
+                                            span(v-else-if="scope.row.previousStatus === 'busy'") Do Not Disturb
                                             span(v-else) Offline
-                                        i.x-user-status(:class="userStatusClass(scope.row.status[1])")
+                                        i.x-user-status(:class="statusClass(scope.row.previousStatus)")
-                                    span(v-text="scope.row.status[1].statusDescription")
+                                    span(v-text="scope.row.previousStatusDescription")
                                     br
                                     span
                                         i.el-icon-right
                                     el-tooltip(placement="top")
                                         template(#content)
-                                            span(v-if="scope.row.status[0].status === 'active'") Active
+                                            span(v-if="scope.row.status === 'active'") Active
-                                            span(v-else-if="scope.row.status[0].status === 'join me'") Join Me
+                                            span(v-else-if="scope.row.status === 'join me'") Join Me
-                                            span(v-else-if="scope.row.status[0].status === 'ask me'") Ask Me
+                                            span(v-else-if="scope.row.status === 'ask me'") Ask Me
-                                            span(v-else-if="scope.row.status[0].status === 'busy'") Do Not Disturb
+                                            span(v-else-if="scope.row.status === 'busy'") Do Not Disturb
                                             span(v-else) Offline
-                                        i.x-user-status(:class="userStatusClass(scope.row.status[0])")
+                                        i.x-user-status(:class="statusClass(scope.row.status)")
-                                    span(v-text="scope.row.status[0].statusDescription")
+                                    span(v-text="scope.row.statusDescription")
                     el-table-column(label="Date" prop="created_at" sortable="custom" width="90")
                         template(v-once #default="scope")
                             el-tooltip(placement="right")
@@ -155,21 +143,21 @@ html
                     el-table-column(label="Detail")
                         template(v-once #default="scope")
                             template(v-if="scope.row.type === 'GPS'")
-                                location(v-if="scope.row.location[0]" :location="scope.row.location[0]")
+                                location(v-if="scope.row.location" :location="scope.row.location" :hint="scope.row.worldName")
                             template(v-else-if="scope.row.type === 'Offline' || scope.row.type === 'Online'")
-                                location(v-if="scope.row.location" :location="scope.row.location")
+                                location(v-if="scope.row.location" :location="scope.row.location" :hint="scope.row.worldName")
                             template(v-else-if="scope.row.type === 'Status'")
                                 el-tooltip(placement="top")
                                     template(#content)
-                                        span(v-if="scope.row.status[0].status === 'active'") Online
+                                        span(v-if="scope.row.status === 'active'") Online
-                                        span(v-else-if="scope.row.status[0].status === 'join me'") Join Me
+                                        span(v-else-if="scope.row.status === 'join me'") Join Me
-                                        span(v-else-if="scope.row.status[0].status === 'ask me'") Ask Me
+                                        span(v-else-if="scope.row.status === 'ask me'") Ask Me
-                                        span(v-else-if="scope.row.status[0].status === 'busy'") Do Not Disturb
+                                        span(v-else-if="scope.row.status === 'busy'") Do Not Disturb
                                         span(v-else) Offline
-                                    i.x-user-status(:class="userStatusClass(scope.row.status[0])")
+                                    i.x-user-status(:class="statusClass(scope.row.status)")
-                                span(v-text="scope.row.status[0].statusDescription")
+                                span(v-text="scope.row.statusDescription")
                             template(v-else-if="scope.row.type === 'Avatar'")
-                                avatar-info(:imageurl="scope.row.avatar[0].currentAvatarImageUrl" :userid="scope.row.userId")
+                                avatar-info(:imageurl="scope.row.currentAvatarImageUrl" :userid="scope.row.userId" :hintownerid="scope.row.ownerId" :hintavatarname="scope.row.avatarName")
 
             //- gameLog
             .x-container(v-show="$refs.menu && $refs.menu.activeIndex === 'gameLog'")

html/src/repository/database.js

@@ -0,0 +1,342 @@
+import sqliteService from '../service/sqlite.js';
+
+class Database {
+    async init(userId) {
+        Database.userId = userId.replaceAll('-', '').replaceAll('_', '');
+        await sqliteService.executeNonQuery(
+            `CREATE TABLE IF NOT EXISTS ${Database.userId}_feed_gps (id INTEGER PRIMARY KEY, created_at TEXT, user_id TEXT, display_name TEXT, location TEXT, world_name TEXT, previous_location TEXT, time INTEGER)`
+        );
+        await sqliteService.executeNonQuery(
+            `CREATE TABLE IF NOT EXISTS ${Database.userId}_feed_status (id INTEGER PRIMARY KEY, created_at TEXT, user_id TEXT, display_name TEXT, status TEXT, status_description TEXT, previous_status TEXT, previous_status_description TEXT)`
+        );
+        await sqliteService.executeNonQuery(
+            `CREATE TABLE IF NOT EXISTS ${Database.userId}_feed_avatar (id INTEGER PRIMARY KEY, created_at TEXT, user_id TEXT, display_name TEXT, owner_id TEXT, avatar_name TEXT, current_avatar_image_url TEXT, current_avatar_thumbnail_image_url TEXT, previous_current_avatar_image_url TEXT, previous_current_avatar_thumbnail_image_url TEXT)`
+        );
+        await sqliteService.executeNonQuery(
+            `CREATE TABLE IF NOT EXISTS ${Database.userId}_feed_online_offline (id INTEGER PRIMARY KEY, created_at TEXT, user_id TEXT, display_name TEXT, type TEXT, location TEXT, world_name TEXT, time INTEGER)`
+        );
+        await sqliteService.executeNonQuery(
+            `CREATE TABLE IF NOT EXISTS ${Database.userId}_friend_log_current (user_id TEXT PRIMARY KEY, display_name TEXT, trust_level TEXT)`
+        );
+        await sqliteService.executeNonQuery(
+            `CREATE TABLE IF NOT EXISTS ${Database.userId}_friend_log_history (id INTEGER PRIMARY KEY, created_at TEXT, type TEXT, user_id TEXT, display_name TEXT, previous_display_name TEXT, trust_level TEXT, previous_trust_level TEXT)`
+        );
+        await sqliteService.executeNonQuery(
+            `CREATE TABLE IF NOT EXISTS memos (user_id TEXT PRIMARY KEY, edited_at TEXT, memo TEXT)`
+        );
+    }
+
+    async getFeedDatabase() {
+        var feedDatabase = [];
+        var date = new Date();
+        date.setDate(date.getDate() - 3);  // 3 day limit
+        var dateOffset = date.toJSON();
+        await sqliteService.execute((dbRow) => {
+            var row = {
+                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]
+            };
+            feedDatabase.unshift(row);
+        }, `SELECT * FROM ${Database.userId}_feed_gps WHERE created_at >= date('${dateOffset}')`);
+        await sqliteService.execute((dbRow) => {
+            var row = {
+                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.unshift(row);
+        }, `SELECT * FROM ${Database.userId}_feed_status WHERE created_at >= date('${dateOffset}')`);
+        await sqliteService.execute((dbRow) => {
+            var row = {
+                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.unshift(row);
+        }, `SELECT * FROM ${Database.userId}_feed_avatar WHERE created_at >= date('${dateOffset}')`);
+        await sqliteService.execute((dbRow) => {
+            var row = {
+                rowId: dbRow[0],
+                created_at: dbRow[1],
+                userId: dbRow[2],
+                displayName: dbRow[3],
+                type: dbRow[4],
+                location: dbRow[5],
+                worldName: dbRow[6],
+                time: dbRow[7]
+            };
+            feedDatabase.unshift(row);
+        }, `SELECT * FROM ${Database.userId}_feed_online_offline WHERE created_at >= date('${dateOffset}')`);
+        var compareByCreatedAt = function (a, b) {
+            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);
+        return feedDatabase;
+    }
+
+    begin() {
+        sqliteService.executeNonQuery('BEGIN');
+    }
+
+    commit() {
+        sqliteService.executeNonQuery('COMMIT');
+    }
+
+    async getMemo(userId) {
+        var row = {};
+        await sqliteService.execute((dbRow, userId) => {
+            row = {
+                userId: dbRow[0],
+                editedAt: dbRow[1],
+                memo: dbRow[2]
+            };
+        }, `SELECT * FROM memos WHERE user_id = '${userId}'`);
+        return row;
+    }
+
+    setMemo(entry) {
+        sqliteService.executeNonQuery(
+            `INSERT OR REPLACE INTO memos (user_id, edited_at, memo) VALUES (@user_id, @edited_at, @memo)`,
+            {
+                '@user_id': entry.userId,
+                '@edited_at': entry.editedAt,
+                '@memo': entry.memo
+            }
+        );
+    }
+
+    deleteMemo(userId) {
+        sqliteService.executeNonQuery(
+            `DELETE FROM memos WHERE user_id = @user_id`,
+            {
+                '@user_id': userId
+            }
+        );
+    }
+
+    async getFriendLogCurrent() {
+        var friendLogCurrent = [];
+        await sqliteService.execute((dbRow) => {
+            var row = {
+                userId: dbRow[0],
+                displayName: dbRow[1],
+                trustLevel: dbRow[2]
+            };
+            friendLogCurrent.unshift(row);
+        }, `SELECT * FROM ${Database.userId}_friend_log_current`);
+        return friendLogCurrent;
+    }
+
+    setFriendLogCurrent(entry) {
+        sqliteService.executeNonQuery(
+            `INSERT OR REPLACE INTO ${Database.userId}_friend_log_current (user_id, display_name, trust_level) VALUES (@user_id, @display_name, @trust_level)`,
+            {
+                '@user_id': entry.userId,
+                '@display_name': entry.displayName,
+                '@trust_level': entry.trustLevel
+            }
+        );
+    }
+
+    setFriendLogCurrentArray(inputData) {
+        var sqlValues = '';
+        var items = ['userId', 'displayName', 'trustLevel'];
+        for (var line of inputData) {
+            for (var item of items) {
+                if (typeof line[item] !== 'undefined') {
+                    line[item] = line[item].replace(/'/g, "\''");
+                } else {
+                    line[item] = '';
+                }
+            }
+            sqlValues += `('${line.userId}', '${line.displayName}', '${line.trustLevel}'), `;
+        }
+        sqlValues = sqlValues.slice(0, -2);
+        sqliteService.executeNonQuery(
+            `INSERT OR REPLACE INTO ${Database.userId}_friend_log_current (user_id, display_name, trust_level) VALUES ${sqlValues}`
+        );
+    }
+
+    deleteFriendLogCurrent(userId) {
+        sqliteService.executeNonQuery(
+            `DELETE FROM ${Database.userId}_friend_log_current WHERE user_id = @user_id`,
+            {
+                '@user_id': userId
+            }
+        );
+    }
+
+    async getFriendLogHistory() {
+        var friendLogHistory = [];
+        await sqliteService.execute((dbRow) => {
+            var row = {
+                rowId: dbRow[0],
+                created_at: dbRow[1],
+                type: dbRow[2],
+                userId: dbRow[3],
+                displayName: dbRow[4]
+            };
+            if (row.type === 'DisplayName') {
+                row.previousDisplayName = dbRow[5];
+            } else if (row.type === 'TrustLevel') {
+                row.trustLevel = dbRow[6];
+                row.previousTrustLevel = dbRow[7];
+            }
+            friendLogHistory.unshift(row);
+        }, `SELECT * FROM ${Database.userId}_friend_log_history`);
+        return friendLogHistory;
+    }
+
+    addFriendLogHistory(entry) {
+        sqliteService.executeNonQuery(
+            `INSERT OR IGNORE INTO ${Database.userId}_friend_log_history (created_at, type, user_id, display_name, previous_display_name, trust_level, previous_trust_level) VALUES (@created_at, @type, @user_id, @display_name, @previous_display_name, @trust_level, @previous_trust_level)`,
+            {
+                '@created_at': entry.created_at,
+                '@type': entry.type,
+                '@user_id': entry.userId,
+                '@display_name': entry.displayName,
+                '@previous_display_name': entry.previousDisplayName,
+                '@trust_level': entry.trustLevel,
+                '@previous_trust_level': entry.previousTrustLevel
+            }
+        );
+    }
+
+    addFriendLogHistoryArray(inputData) {
+        var sqlValues = '';
+        var items = ['created_at', 'type', 'userId', 'displayName', 'previousDisplayName', 'trustLevel', 'previousTrustLevel'];
+        for (var i = 0; i < inputData.length; ++i) {
+            var line = inputData[i];
+            sqlValues +=  '(';
+            for (var k = 0; k < items.length; ++k) {
+                var item = items[k];
+                var field = '';
+                if (typeof line[item] !== 'undefined') {
+                    field = `'${line[item].replace(/'/g, "\''")}'`;
+                } else {
+                    field = null;
+                }
+                sqlValues += field;
+                if (k < items.length - 1) {
+                    sqlValues += ', ';
+                }
+            }
+            sqlValues +=  ')';
+            if (i < inputData.length - 1) {
+                sqlValues += ', ';
+            }
+            //sqlValues `('${line.created_at}', '${line.type}', '${line.userId}', '${line.displayName}', '${line.previousDisplayName}', '${line.trustLevel}', '${line.previousTrustLevel}'), `
+        }
+        sqliteService.executeNonQuery(
+            `INSERT OR IGNORE INTO ${Database.userId}_friend_log_history (created_at, type, user_id, display_name, previous_display_name, trust_level, previous_trust_level) VALUES ${sqlValues}`
+        );
+    }
+
+    deleteFriendLogHistory(rowId) {
+        sqliteService.executeNonQuery(
+            `DELETE FROM ${Database.userId}_friend_log_history WHERE id = @row_id`,
+            {
+                '@row_id': rowId
+            }
+        );
+    }
+
+    addGPSToDatabase(entry) {
+        sqliteService.executeNonQuery(
+            `INSERT OR IGNORE INTO ${Database.userId}_feed_gps (created_at, user_id, display_name, location, world_name, previous_location, time) VALUES (@created_at, @user_id, @display_name, @location, @world_name, @previous_location, @time)`,
+            {
+                '@created_at': entry.created_at,
+                '@user_id': entry.userId,
+                '@display_name': entry.displayName,
+                '@location': entry.location,
+                '@world_name': entry.worldName,
+                '@previous_location': entry.previousLocation,
+                '@time': entry.time
+            }
+        );
+    }
+
+    addStatusToDatabase(entry) {
+        sqliteService.executeNonQuery(
+            `INSERT OR IGNORE INTO ${Database.userId}_feed_status (created_at, user_id, display_name, status, status_description, previous_status, previous_status_description) VALUES (@created_at, @user_id, @display_name, @status, @status_description, @previous_status, @previous_status_description)`,
+            {
+                '@created_at': entry.created_at,
+                '@user_id': entry.userId,
+                '@display_name': entry.displayName,
+                '@status': entry.status,
+                '@status_description': entry.statusDescription,
+                '@previous_status': entry.previousStatus,
+                '@previous_status_description': entry.previousStatusDescription
+            }
+        );
+    }
+
+    addAvatarToDatabase(entry) {
+        sqliteService.executeNonQuery(
+            `INSERT OR IGNORE INTO ${Database.userId}_feed_avatar (created_at, user_id, display_name, owner_id, avatar_name, current_avatar_image_url, current_avatar_thumbnail_image_url, previous_current_avatar_image_url, previous_current_avatar_thumbnail_image_url) VALUES (@created_at, @user_id, @display_name, @owner_id, @avatar_name, @current_avatar_image_url, @current_avatar_thumbnail_image_url, @previous_current_avatar_image_url, @previous_current_avatar_thumbnail_image_url)`,
+            {
+                '@created_at': entry.created_at,
+                '@user_id': entry.userId,
+                '@display_name': entry.displayName,
+                '@owner_id': entry.ownerId,
+                '@avatar_name': entry.avatarName,
+                '@current_avatar_image_url': entry.currentAvatarImageUrl,
+                '@current_avatar_thumbnail_image_url': entry.currentAvatarThumbnailImageUrl,
+                '@previous_current_avatar_image_url': entry.previousCurrentAvatarImageUrl,
+                '@previous_current_avatar_thumbnail_image_url': entry.previousCurrentAvatarThumbnailImageUrl
+            }
+        );
+    }
+
+    addOnlineOfflineToDatabase(entry) {
+        sqliteService.executeNonQuery(
+            `INSERT OR IGNORE INTO ${Database.userId}_feed_online_offline (created_at, user_id, display_name, type, location, world_name, time) VALUES (@created_at, @user_id, @display_name, @type, @location, @world_name, @time)`,
+            {
+                '@created_at': entry.created_at,
+                '@user_id': entry.userId,
+                '@display_name': entry.displayName,
+                '@type': entry.type,
+                '@location': entry.location,
+                '@world_name': entry.worldName,
+                '@time': entry.time
+            }
+        );
+    }
+}
+
+var self = new Database();
+window.database = self;
+
+export {
+    self as default,
+    Database
+};

html/src/vr.js

@@ -481,24 +481,10 @@ speechSynthesis.getVoices();
                         this.text = this.hint;
                     }
                 } else if (L.worldId) {
-                    var ref = API.cachedWorlds.get(L.worldId);
+                    if (L.instanceId) {
-                    if (typeof ref === 'undefined') {
+                        this.text = ` #${L.instanceName} ${L.accessType}`;
-                        API.getWorld({
-                            worldId: L.worldId
-                        }).then((args) => {
-                            if (L.tag === this.location) {
-                                if (L.instanceId) {
-                                    this.text = `${args.json.name} #${L.instanceName} ${L.accessType}`;
-                                } else {
-                                    this.text = args.json.name;
-                                }
-                            }
-                            return args;
-                        });
-                    } else if (L.instanceId) {
-                        this.text = `${ref.name} #${L.instanceName} ${L.accessType}`;
                     } else {
-                        this.text = ref.name;
+                        this.text = this.location;
                     }
                 }
                 this.region = '';
@@ -864,7 +850,7 @@ speechSynthesis.getVoices();
         }
     };
 
-    $app.methods.updateSharedFeedNoty = async function (notyFeed) {
+    $app.methods.updateSharedFeedNoty = function (notyFeed) {
         var notyToPlay = [];
         notyFeed.forEach((feed) => {
             var displayName = '';
@@ -916,7 +902,7 @@ speechSynthesis.getVoices();
                         text = `<strong>${noty.displayName}</strong> is joining`;
                         break;
                     case 'GPS':
-                        text = `<strong>${noty.displayName}</strong> is in ${await this.displayLocation(noty.location[0])}`;
+                        text = `<strong>${noty.displayName}</strong> is in ${this.displayLocation(noty.location, noty.worldName)}`;
                         break;
                     case 'Online':
                         text = `<strong>${noty.displayName}</strong> has logged in`;
@@ -925,7 +911,7 @@ speechSynthesis.getVoices();
                         text = `<strong>${noty.displayName}</strong> has logged out`;
                         break;
                     case 'Status':
-                        text = `<strong>${noty.displayName}</strong> status is now <i>${noty.status[0].status}</i> ${noty.status[0].statusDescription}`;
+                        text = `<strong>${noty.displayName}</strong> status is now <i>${noty.status}</i> ${noty.statusDescription}`;
                         break;
                     case 'invite':
                         text = `<strong>${noty.senderUsername}</strong> has invited you to ${noty.details.worldName} ${message}`;
@@ -991,25 +977,19 @@ speechSynthesis.getVoices();
         }
     };
 
-    $app.methods.userStatusClass = function (user) {
+    $app.methods.statusClass = function (status) {
         var style = {};
-        if (typeof user !== 'undefined') {
+        if (typeof status !== 'undefined') {
-            if (user.location === 'offline') {
+            if (status === 'active') {
-                // Offline
-                style.offline = true;
-            } else if (user.state === 'active') {
-                // Active
-                style.active = true;
-            } else if (user.status === 'active') {
                 // Online
                 style.online = true;
-            } else if (user.status === 'join me') {
+            } else if (status === 'join me') {
                 // Join Me
                 style.joinme = true;
-            } else if (user.status === 'ask me') {
+            } else if (status === 'ask me') {
                 // Ask Me
                 style.askme = true;
-            } else if (user.status === 'busy') {
+            } else if (status === 'busy') {
                 // Do Not Disturb
                 style.busy = true;
             }
@@ -1017,7 +997,7 @@ speechSynthesis.getVoices();
         return style;
     };
 
-    $app.methods.displayLocation = async function (location) {
+    $app.methods.displayLocation = function (location, worldName) {
         var text = '';
         var L = API.parseLocation(location);
         if (L.isOffline) {
@@ -1025,23 +1005,10 @@ speechSynthesis.getVoices();
         } else if (L.isPrivate) {
             text = 'Private';
         } else if (L.worldId) {
-            var ref = API.cachedWorlds.get(L.worldId);
+            if (L.instanceId) {
-            if (typeof ref === 'undefined') {
+                text = `${worldName} ${L.accessType}`;
-                await API.getWorld({
-                    worldId: L.worldId
-                }).then((args) => {
-                    if (L.tag === location) {
-                        if (L.instanceId) {
-                            text = `${args.json.name} ${L.accessType}`;
-                        } else {
-                            text = args.json.name;
-                        }
-                    }
-                });
-            } else if (L.instanceId) {
-                text = `${ref.name} ${L.accessType}`;
             } else {
-                text = ref.name;
+                text = worldName;
             }
         }
         return text;

html/src/vr.pug

@@ -21,7 +21,7 @@ html
                                 .detail
                                     span.extra
                                         span.time {{ feed.created_at | formatDate('HH:MI') }}
-                                        | #[span.name(v-text="feed.displayName")] #[location(:location="feed.location[0]")]
+                                        | #[span.name(v-text="feed.displayName")] #[location(:location="feed.location" :hint="feed.worldName")]
                             div(v-else-if="feed.type === 'Offline'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }")
                                 .detail
                                     span.extra
@@ -36,7 +36,7 @@ html
                                 .detail
                                     span.extra
                                         span.time {{ feed.created_at | formatDate('HH:MI') }}
-                                        | #[span.name(v-text="feed.displayName")] #[i.x-user-status(:class="userStatusClass(feed.status[0])")] {{feed.status[0].statusDescription}}
+                                        | #[span.name(v-text="feed.displayName")] #[i.x-user-status(:class="statusClass(feed.status)")] {{feed.statusDescription}}
                             div(v-else-if="feed.type === 'OnPlayerJoined'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }")
                                 .detail
                                     span.extra
@@ -62,7 +62,7 @@ html
                                 .detail
                                     span.extra
                                         span.time {{ feed.created_at | formatDate('HH:MI') }}
-                                        | 📨 #[span.name(v-text="feed.senderUsername")] #[location(:location="feed.details.worldId")] #[span(v-text="feed.details.inviteMessage")]
+                                        | 📨 #[span.name(v-text="feed.senderUsername")] #[location(:location="feed.details.worldId" :hint="feed.details.worldName")] #[span(v-text="feed.details.inviteMessage")]
                             div(v-else-if="feed.type === 'requestInvite'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }")
                                 .detail
                                     span.extra
@@ -144,7 +144,7 @@ html
                                 .detail
                                     span.extra
                                         span.time {{ feed.created_at | formatDate('HH:MI') }}
-                                        | #[span.name(v-text="feed.displayName")] is in #[location(:location="feed.location[0]")]
+                                        | #[span.name(v-text="feed.displayName")] is in #[location(:location="feed.location" :hint="feed.worldName")]
                             div(v-else-if="feed.type === 'Offline'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }")
                                 .detail
                                     span.extra
@@ -159,7 +159,7 @@ html
                                 .detail
                                     span.extra
                                         span.time {{ feed.created_at | formatDate('HH:MI') }}
-                                        | #[span.name(v-text="feed.displayName")] is #[i.x-user-status(:class="userStatusClass(feed.status[0])")] {{feed.status[0].statusDescription}}
+                                        | #[span.name(v-text="feed.displayName")] is #[i.x-user-status(:class="statusClass(feed.status)")] {{feed.statusDescription}}
                             div(v-else-if="feed.type === 'OnPlayerJoined'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }")
                                 .detail
                                     span.extra
@@ -184,7 +184,7 @@ html
                                 .detail
                                     span.extra
                                         span.time {{ feed.created_at | formatDate('HH:MI') }}
-                                        | #[span.name(v-text="feed.senderUsername")] has invited you to #[location(:location="feed.details.worldId")] #[span(v-text="feed.details.inviteMessage")]
+                                        | #[span.name(v-text="feed.senderUsername")] has invited you to #[location(:location="feed.details.worldId" :hint="feed.details.worldName")] #[span(v-text="feed.details.inviteMessage")]
                             div(v-else-if="feed.type === 'requestInvite'" class="x-friend-item" :class="{ friend: feed.isFriend, favorite: feed.isFavorite }")
                                 .detail
                                     span.extra