mirror of
https://github.com/kokonect-link/cherrypick
synced 2024-12-13 06:08:58 +09:00
Merge branch 'develop' into mfm-rainbow-fallback
This commit is contained in:
commit
ed2fbdee45
10
CHANGELOG.md
10
CHANGELOG.md
@ -11,6 +11,16 @@
|
|||||||
-
|
-
|
||||||
|
|
||||||
-->
|
-->
|
||||||
|
## 13.x.x (unreleased)
|
||||||
|
|
||||||
|
### General
|
||||||
|
-
|
||||||
|
|
||||||
|
### Client
|
||||||
|
- リストTLで、ユーザーが追加・削除されてもTLを初期化しないように
|
||||||
|
|
||||||
|
### Server
|
||||||
|
-
|
||||||
|
|
||||||
## 13.x.x (unreleased)
|
## 13.x.x (unreleased)
|
||||||
|
|
||||||
|
@ -108,8 +108,7 @@ function waitForDecode() {
|
|||||||
.then(() => {
|
.then(() => {
|
||||||
loaded = true;
|
loaded = true;
|
||||||
}, error => {
|
}, error => {
|
||||||
console.error('Error occurred during decoding image', img.value, error);
|
console.log('Error occurred during decoding image', img.value, error);
|
||||||
throw Error(error);
|
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
loaded = false;
|
loaded = false;
|
||||||
|
@ -38,14 +38,6 @@ const prepend = note => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const onUserAdded = () => {
|
|
||||||
tlComponent.pagingComponent?.reload();
|
|
||||||
};
|
|
||||||
|
|
||||||
const onUserRemoved = () => {
|
|
||||||
tlComponent.pagingComponent?.reload();
|
|
||||||
};
|
|
||||||
|
|
||||||
let endpoint;
|
let endpoint;
|
||||||
let query;
|
let query;
|
||||||
let connection;
|
let connection;
|
||||||
@ -125,8 +117,6 @@ if (props.src === 'antenna') {
|
|||||||
listId: props.list,
|
listId: props.list,
|
||||||
});
|
});
|
||||||
connection.on('note', prepend);
|
connection.on('note', prepend);
|
||||||
connection.on('userAdded', onUserAdded);
|
|
||||||
connection.on('userRemoved', onUserRemoved);
|
|
||||||
} else if (props.src === 'channel') {
|
} else if (props.src === 'channel') {
|
||||||
endpoint = 'channels/timeline';
|
endpoint = 'channels/timeline';
|
||||||
query = {
|
query = {
|
||||||
|
Loading…
Reference in New Issue
Block a user