41 lines
1.9 KiB
Diff
41 lines
1.9 KiB
Diff
--- source-linux/CMakeLists.txt 2021-05-12 21:27:38.172988268 +0200
|
|
+++ source-linux/CMakeLists.txt 2021-06-22 21:57:17.487089044 +0200
|
|
@@ -13,7 +13,7 @@
|
|
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
|
endif()
|
|
|
|
-find_package(Qt5 COMPONENTS Widgets Quick Sql DBus WebView REQUIRED)
|
|
+find_package(Qt5 COMPONENTS Widgets Quick Sql DBus REQUIRED)
|
|
|
|
set(MOC_SOURCES common/uploadableimage.h
|
|
common/xhr.h
|
|
@@ -38,7 +38,6 @@
|
|
target_link_libraries(friendiqa Qt::Widgets)
|
|
target_link_libraries(friendiqa Qt::Quick)
|
|
target_link_libraries(friendiqa Qt::Sql)
|
|
-target_link_libraries(friendiqa Qt::WebView)
|
|
target_link_libraries(friendiqa Qt::DBus)
|
|
# target_link_libraries(friendiqa Qt::Webengine)
|
|
|
|
--- source-linux/js/newsworker.js 2021-06-22 21:40:46.938247380 +0200
|
|
+++ source-linux/js/newsworker.js 2021-06-22 22:00:10.789922846 +0200
|
|
@@ -107,17 +107,7 @@
|
|
if ((videoAttachmentList.length==0) || (videoAttachmentList[videoAttachmentList.length-1].url!=ptvideohelper.url)){videoAttachmentList.push(ptvideohelper)}
|
|
}
|
|
}
|
|
- if (newsitemobject.text.indexOf("youtube.com/watch?v")>-1){
|
|
- var yttext=newsitemobject.text;
|
|
- while (yttext.indexOf("youtube.com/watch?v")>-1){
|
|
- var ythelperstringposition=yttext.indexOf("watch?v=");
|
|
- var ytposend=findend(yttext,ythelperstringposition);
|
|
- var ythelper={mimetype:"video/youtube"}
|
|
- ythelper.url=yttext.substring(ythelperstringposition+8,ytposend);
|
|
- yttext=yttext.substring(ytposend,yttext.length);
|
|
- if ((videoAttachmentList.length==0) || (videoAttachmentList[videoAttachmentList.length-1].url!=ythelper.url)){videoAttachmentList.push(ythelper)}
|
|
- }
|
|
- }
|
|
+
|
|
newsitemobject.videoAttachmentList=videoAttachmentList;
|
|
newsitemobject.imageAttachmentList=imageAttachmentList;
|
|
if ((msg.options.hasOwnProperty("hide_nsfw"))&&(msg.options.hide_nsfw==1)&&(newsitemobject.text.indexOf("#nsfw")>-1)){
|