matty/peertube-plugin-livechat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Converse upstream updates.

Browse Source
This commit is contained in:
John Livingston 2024-07-15 12:09:25 +02:00
parent a0d5c4a368
commit d0ab3d94ae
No known key found for this signature in database
GPG Key ID: B17B5640CE66CDBC
5 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conversejs/build-conversejs.sh
View File

@ -18,7 +18,7 @@ set -x
CONVERSE_VERSION="v11.0.0" CONVERSE_VERSION="v11.0.0"
CONVERSE_REPO="https://github.com/conversejs/converse.js.git" CONVERSE_REPO="https://github.com/conversejs/converse.js.git"
# You can eventually set CONVERSE_COMMIT to a specific commit ID, if you want to apply some patches. # You can eventually set CONVERSE_COMMIT to a specific commit ID, if you want to apply some patches.
CONVERSE_COMMIT="ef86863cbd983f0c2de6c3b81105800bcbb804d4" CONVERSE_COMMIT="46313ad92c1a861bcb50b9653859cfa9a960ae4a"
# 2014-01-16: we are using a custom version, to wait for some PR to be apply upstream. # 2014-01-16: we are using a custom version, to wait for some PR to be apply upstream.
# This version includes following changes: # This version includes following changes:

2
conversejs/custom/plugins/poll/utils.js
View File

@ -8,7 +8,7 @@ import { __ } from 'i18n'
export function getHeadingButtons (view, buttons) { export function getHeadingButtons (view, buttons) {
const muc = view.model const muc = view.model
if (muc.get('type') !== _converse.CHATROOMS_TYPE) { if (muc.get('type') !== _converse.constants.CHATROOMS_TYPE) {
// only on MUC. // only on MUC.
return buttons return buttons
} }

4
conversejs/custom/plugins/tasks/utils.js
View File

@ -9,7 +9,7 @@ import { __ } from 'i18n'
export function getHeadingButtons (view, buttons) { export function getHeadingButtons (view, buttons) {
const muc = view.model const muc = view.model
if (muc.get('type') !== _converse.CHATROOMS_TYPE) { if (muc.get('type') !== _converse.constants.CHATROOMS_TYPE) {
// only on MUC. // only on MUC.
return buttons return buttons
} }
@ -127,7 +127,7 @@ function _destroyChatRoomTaskLists (mucModel) {
} }
export function initOrDestroyChatRoomTaskLists (mucModel) { export function initOrDestroyChatRoomTaskLists (mucModel) {
if (mucModel.get('type') !== _converse.CHATROOMS_TYPE) { if (mucModel.get('type') !== _converse.constants.CHATROOMS_TYPE) {
// only on MUC. // only on MUC.
return _destroyChatRoomTaskLists(mucModel) return _destroyChatRoomTaskLists(mucModel)
} }

2
conversejs/lib/plugins/livechat-mini-muc-head.ts
View File

@ -16,7 +16,7 @@ export const livechatMiniMucHeadPlugin = {
}) })
_converse.api.listen.on('getHeadingButtons', (view: any, buttons: any[]) => { _converse.api.listen.on('getHeadingButtons', (view: any, buttons: any[]) => {
if (view.model.get('type') !== _converse.CHATROOMS_TYPE) { if (view.model.get('type') !== _converse.constants.CHATROOMS_TYPE) {
// only on MUC. // only on MUC.
return buttons return buttons
} }

7
conversejs/lib/plugins/livechat-specific.ts
View File

@ -15,7 +15,7 @@ export const livechatSpecificsPlugin = {
}) })
_converse.api.listen.on('getHeadingButtons', (view: any, buttons: any[]) => { _converse.api.listen.on('getHeadingButtons', (view: any, buttons: any[]) => {
if (view.model.get('type') !== _converse.CHATROOMS_TYPE) { if (view.model.get('type') !== _converse.constants.CHATROOMS_TYPE) {
// only on MUC. // only on MUC.
return buttons return buttons
} }
@ -114,11 +114,6 @@ export const livechatSpecificsPlugin = {
// We are probably on a dev instance, so we will add _converse in window: // We are probably on a dev instance, so we will add _converse in window:
(window as any)._livechatConverse = _converse (window as any)._livechatConverse = _converse
} }
// Temporary Fix, because v11 removes some constants from _converse.
// TODO: remove this line, and replace by something else.
// Waiting for response to https://github.com/conversejs/converse.js/issues/3440
_converse.CHATROOMS_TYPE = 'chatroom'
}, },
overrides: { overrides: {
ChatRoom: { ChatRoom: {