Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Linus Jahn
kaidan
Commits
109dc5d6
Unverified
Commit
109dc5d6
authored
Aug 28, 2020
by
Linus Jahn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove legacy code of Spoiler Messages impl
parent
519fc7ab
Pipeline
#32142
canceled with stage
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
46 deletions
+0
-46
src/Globals.h
src/Globals.h
+0
-1
src/Message.cpp
src/Message.cpp
+0
-20
src/Message.h
src/Message.h
+0
-16
src/MessageHandler.cpp
src/MessageHandler.cpp
+0
-9
No files found.
src/Globals.h
View file @
109dc5d6
...
...
@@ -49,7 +49,6 @@
constexpr
auto
MESSAGE_MAX_CHARS
=
1e4
;
// XML namespaces
#define NS_SPOILERS "urn:xmpp:spoiler:0"
#define NS_CARBONS "urn:xmpp:carbons:2"
// SQL
...
...
src/Message.cpp
View file @
109dc5d6
...
...
@@ -194,26 +194,6 @@ void Message::setMediaSize(const qint64 &mediaSize)
m_mediaSize
=
mediaSize
;
}
bool
Message
::
isSpoiler
()
const
{
return
m_isSpoiler
;
}
void
Message
::
setIsSpoiler
(
bool
isSpoiler
)
{
m_isSpoiler
=
isSpoiler
;
}
QString
Message
::
spoilerHint
()
const
{
return
m_spoilerHint
;
}
void
Message
::
setSpoilerHint
(
const
QString
&
spoilerHint
)
{
m_spoilerHint
=
spoilerHint
;
}
QString
Message
::
errorText
()
const
{
return
m_errorText
;
...
...
src/Message.h
View file @
109dc5d6
...
...
@@ -82,12 +82,6 @@ public:
qint64
mediaSize
()
const
;
void
setMediaSize
(
const
qint64
&
mediaSize
);
bool
isSpoiler
()
const
;
void
setIsSpoiler
(
bool
isSpoiler
);
QString
spoilerHint
()
const
;
void
setSpoilerHint
(
const
QString
&
spoilerHint
);
QString
errorText
()
const
;
void
setErrorText
(
const
QString
&
errText
);
...
...
@@ -138,16 +132,6 @@ private:
*/
QDateTime
m_mediaLastModified
;
/**
* True if the message is a spoiler message.
*/
bool
m_isSpoiler
=
false
;
/**
* Hint of the spoiler message.
*/
QString
m_spoilerHint
;
/**
* Text description of an error if it ever happened to the message
*/
...
...
src/MessageHandler.cpp
View file @
109dc5d6
...
...
@@ -171,15 +171,6 @@ void MessageHandler::sendMessage(const QString& toJid,
if
(
isSpoiler
)
{
msg
.
setIsSpoiler
(
isSpoiler
);
msg
.
setSpoilerHint
(
spoilerHint
);
// parsing/serialization of spoilers isn't implemented in QXmpp
QXmppElementList
extensions
=
msg
.
extensions
();
QXmppElement
spoiler
=
QXmppElement
();
spoiler
.
setTagName
(
"spoiler"
);
spoiler
.
setValue
(
msg
.
spoilerHint
());
spoiler
.
setAttribute
(
"xmlns"
,
NS_SPOILERS
);
extensions
.
append
(
spoiler
);
msg
.
setExtensions
(
extensions
);
}
else
if
(
MediaUtils
::
isGeoLocation
(
msg
.
body
()))
{
const
QUrl
url
(
msg
.
body
());
const
QMimeType
mimeType
=
MediaUtils
::
mimeType
(
url
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment