moxxy/moxxmpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(all): Fix linter warnings

Browse Source
This commit is contained in:
PapaTutuWawa 2023-09-22 20:57:05 +02:00
parent fbe3b90200
commit 5f36289f50
31 changed files with 160 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/moxxmpp/lib/src/message.dart
View File

@ -66,7 +66,7 @@ class MessageManager extends XmppManagerBase {
stanzaTag: 'message',
callback: _onMessage,
priority: messageHandlerPriority,
)
),
];
@override

2
packages/moxxmpp/lib/src/presence.dart
View File

@ -66,7 +66,7 @@ class PresenceManager extends XmppManagerBase {
stanzaTag: 'presence',
callback: _onPresence,
priority: presenceHandlerPriority,
)
),
];
@override

18
packages/moxxmpp/lib/src/roster/roster.dart
View File

@ -122,7 +122,7 @@ class RosterManager extends XmppManagerBase {
tagName: 'query',
tagXmlns: rosterXmlns,
callback: _onRosterPush,
)
),
];
@override
@ -277,7 +277,7 @@ class RosterManager extends XmppManagerBase {
attributes: {
'ver': await _stateManager.getRosterVersion() ?? '',
},
)
),
],
),
),
@ -319,14 +319,12 @@ class RosterManager extends XmppManagerBase {
tag: 'item',
attributes: <String, String>{
'jid': jid,
...title == jid.split('@')[0]
? <String, String>{}
: <String, String>{'name': title}
if (title == jid.split('@')[0]) 'name': title,
},
children: (groups ?? [])
.map((group) => XMLNode(tag: 'group', text: group))
.toList(),
)
),
],
),
],
@ -357,13 +355,13 @@ class RosterManager extends XmppManagerBase {
children: [
XMLNode(
tag: 'item',
attributes: <String, String>{
attributes: {
'jid': jid,
'subscription': 'remove'
'subscription': 'remove',
},
)
),
],
)
),
],
),
),

17
packages/moxxmpp/lib/src/stanza.dart
View File

@ -248,15 +248,14 @@ XMLNode buildErrorElement(String type, String condition, {String? text}) {
XMLNode.xmlns(
tag: condition,
xmlns: fullStanzaXmlns,
children: text != null
? [
XMLNode.xmlns(
tag: 'text',
xmlns: fullStanzaXmlns,
text: text,
)
]
: [],
children: [
if (text != null)
XMLNode.xmlns(
tag: 'text',
xmlns: fullStanzaXmlns,
text: text,
),
],
),
],
);

31
packages/moxxmpp/lib/src/xeps/xep_0004.dart
View File

@ -10,14 +10,14 @@ class DataFormOption {
XMLNode toXml() {
return XMLNode(
tag: 'option',
attributes: label != null
? <String, dynamic>{'label': label}
: <String, dynamic>{},
attributes: {
if (label != null) 'label': label,
},
children: [
XMLNode(
tag: 'value',
text: value,
)
),
],
);
}
@ -45,19 +45,22 @@ class DataFormField {
return XMLNode(
tag: 'field',
attributes: <String, dynamic>{
...varAttr != null
? <String, dynamic>{'var': varAttr}
: <String, dynamic>{},
...type != null ? <String, dynamic>{'type': type} : <String, dynamic>{},
...label != null
? <String, dynamic>{'label': label}
: <String, dynamic>{}
if (varAttr != null) 'var': varAttr,
if (type != null) 'type': type,
if (label != null) 'label': label,
},
children: [
...description != null ? [XMLNode(tag: 'desc', text: description)] : [],
...isRequired ? [XMLNode(tag: 'required')] : [],
if (description != null)
XMLNode(
tag: 'desc',
text: description,
),
if (isRequired)
XMLNode(
tag: 'required',
),
...values.map((value) => XMLNode(tag: 'value', text: value)),
...options.map((option) => option.toXml())
...options.map((option) => option.toXml()),
],
);
}

12
packages/moxxmpp/lib/src/xeps/xep_0030/helpers.dart
View File

@ -13,8 +13,10 @@ Stanza buildDiscoInfoQueryStanza(JID entity, String? node) {
XMLNode.xmlns(
tag: 'query',
xmlns: discoInfoXmlns,
attributes: node != null ? {'node': node} : {},
)
attributes: {
if (node != null) 'node': node,
},
),
],
);
}
@ -27,8 +29,10 @@ Stanza buildDiscoItemsQueryStanza(JID entity, {String? node}) {
XMLNode.xmlns(
tag: 'query',
xmlns: discoItemsXmlns,
attributes: node != null ? {'node': node} : {},
)
attributes: {
if (node != null) 'node': node,
},
),
],
);
}

6
packages/moxxmpp/lib/src/xeps/xep_0030/types.dart
View File

@ -19,13 +19,11 @@ class Identity {
XMLNode toXMLNode() {
return XMLNode(
tag: 'identity',
attributes: <String, dynamic>{
attributes: {
'category': category,
'type': type,
'name': name,
...lang == null
? <String, dynamic>{}
: <String, dynamic>{'xml:lang': lang}
if (lang != null) 'xml:lang': lang,
},
);
}

4
packages/moxxmpp/lib/src/xeps/xep_0054.dart
View File

@ -38,7 +38,7 @@ class VCardManager extends XmppManagerBase {
tagName: 'x',
tagXmlns: vCardTempUpdate,
callback: _onPresence,
)
),
];
@override
@ -108,7 +108,7 @@ class VCardManager extends XmppManagerBase {
XMLNode.xmlns(
tag: 'vCard',
xmlns: vCardTempXmlns,
)
),
],
),
encrypted: true,

48
packages/moxxmpp/lib/src/xeps/xep_0060/xep_0060.dart
View File

@ -38,26 +38,20 @@ class PubSubPublishOptions {
varAttr: 'FORM_TYPE',
type: 'hidden',
),
...accessModel != null
? [
DataFormField(
options: [],
isRequired: false,
values: [accessModel!],
varAttr: 'pubsub#access_model',
)
]
: [],
...maxItems != null
? [
DataFormField(
options: [],
isRequired: false,
values: [maxItems!],
varAttr: 'pubsub#max_items',
),
]
: [],
if (accessModel != null)
DataFormField(
options: [],
isRequired: false,
values: [accessModel!],
varAttr: 'pubsub#access_model',
),
if (maxItems != null)
DataFormField(
options: [],
isRequired: false,
values: [maxItems!],
varAttr: 'pubsub#max_items',
),
],
).toXml();
}
@ -87,7 +81,7 @@ class PubSubManager extends XmppManagerBase {
tagName: 'event',
tagXmlns: pubsubEventXmlns,
callback: _onPubsubMessage,
)
),
];
@override
@ -314,11 +308,11 @@ class PubSubManager extends XmppManagerBase {
children: [
XMLNode(
tag: 'item',
attributes: id != null
? <String, String>{'id': id}
: <String, String>{},
attributes: {
if (id != null) 'id': id,
},
children: [payload],
)
),
],
),
if (pubOptions != null)
@ -327,7 +321,7 @@ class PubSubManager extends XmppManagerBase {
children: [pubOptions.toXml()],
),
],
)
),
],
),
shouldEncrypt: false,
@ -422,7 +416,7 @@ class PubSubManager extends XmppManagerBase {
},
),
],
)
),
],
),
shouldEncrypt: false,

2
packages/moxxmpp/lib/src/xeps/xep_0066.dart
View File

@ -45,7 +45,7 @@ class OOBManager extends XmppManagerBase {
callback: _onMessage,
// Before the message manager
priority: -99,
)
),
];
@override

2
packages/moxxmpp/lib/src/xeps/xep_0085.dart
View File

@ -69,7 +69,7 @@ class ChatStateManager extends XmppManagerBase {
callback: _onChatStateReceived,
// Before the message handler
priority: -99,
)
),
];
@override

2
packages/moxxmpp/lib/src/xeps/xep_0184.dart
View File

@ -66,7 +66,7 @@ class MessageDeliveryReceiptManager extends XmppManagerBase {
callback: _onDeliveryRequestReceived,
// Before the message handler
priority: -99,
)
),
];
@override

18
packages/moxxmpp/lib/src/xeps/xep_0191.dart
View File

@ -27,7 +27,7 @@ class BlockingManager extends XmppManagerBase {
tagName: 'block',
tagXmlns: blockingXmlns,
callback: _blockPush,
)
),
];
@override
@ -107,10 +107,12 @@ class BlockingManager extends XmppManagerBase {
children: items.map((item) {
return XMLNode(
tag: 'item',
attributes: <String, String>{'jid': item},
attributes: {
'jid': item,
},
);
}).toList(),
)
),
],
),
),
@ -128,7 +130,7 @@ class BlockingManager extends XmppManagerBase {
XMLNode.xmlns(
tag: 'unblock',
xmlns: blockingXmlns,
)
),
],
),
),
@ -152,11 +154,13 @@ class BlockingManager extends XmppManagerBase {
.map(
(item) => XMLNode(
tag: 'item',
attributes: <String, String>{'jid': item},
attributes: {
'jid': item,
},
),
)
.toList(),
)
),
],
),
),
@ -174,7 +178,7 @@ class BlockingManager extends XmppManagerBase {
XMLNode.xmlns(
tag: 'blocklist',
xmlns: blockingXmlns,
)
),
],
),
),

16
packages/moxxmpp/lib/src/xeps/xep_0198/nonzas.dart
View File

@ -5,7 +5,10 @@ class StreamManagementEnableNonza extends XMLNode {
StreamManagementEnableNonza()
: super(
tag: 'enable',
attributes: <String, String>{'xmlns': smXmlns, 'resume': 'true'},
attributes: {
'xmlns': smXmlns,
'resume': 'true',
},
);
}
@ -13,10 +16,10 @@ class StreamManagementResumeNonza extends XMLNode {
StreamManagementResumeNonza(String id, int h)
: super(
tag: 'resume',
attributes: <String, String>{
attributes: {
'xmlns': smXmlns,
'previd': id,
'h': h.toString()
'h': h.toString(),
},
);
}
@ -25,7 +28,10 @@ class StreamManagementAckNonza extends XMLNode {
StreamManagementAckNonza(int h)
: super(
tag: 'a',
attributes: <String, String>{'xmlns': smXmlns, 'h': h.toString()},
attributes: {
'xmlns': smXmlns,
'h': h.toString(),
},
);
}
@ -33,7 +39,7 @@ class StreamManagementRequestNonza extends XMLNode {
StreamManagementRequestNonza()
: super(
tag: 'r',
attributes: <String, String>{
attributes: {
'xmlns': smXmlns,
},
);

6
packages/moxxmpp/lib/src/xeps/xep_0198/xep_0198.dart
View File

@ -140,7 +140,7 @@ class StreamManagementManager extends XmppManagerBase {
nonzaTag: 'a',
nonzaXmlns: smXmlns,
callback: _handleAckResponse,
)
),
];
@override
@ -148,14 +148,14 @@ class StreamManagementManager extends XmppManagerBase {
StanzaHandler(
callback: _onServerStanzaReceived,
priority: 9999,
)
),
];
@override
List<StanzaHandler> getOutgoingPostStanzaHandlers() => [
StanzaHandler(
callback: _onClientStanzaSent,
)
),
];
@override

6
packages/moxxmpp/lib/src/xeps/xep_0280.dart
View File

@ -49,7 +49,7 @@ class CarbonsManager extends XmppManagerBase {
tagXmlns: carbonsXmlns,
callback: _onMessageSent,
priority: -98,
)
),
];
@override
@ -124,7 +124,7 @@ class CarbonsManager extends XmppManagerBase {
XMLNode.xmlns(
tag: 'enable',
xmlns: carbonsXmlns,
)
),
],
),
),
@ -154,7 +154,7 @@ class CarbonsManager extends XmppManagerBase {
XMLNode.xmlns(
tag: 'disable',
xmlns: carbonsXmlns,
)
),
],
),
),

2
packages/moxxmpp/lib/src/xeps/xep_0308.dart
View File

@ -40,7 +40,7 @@ class LastMessageCorrectionManager extends XmppManagerBase {
callback: _onMessage,
// Before the message handler
priority: -99,
)
),
];
@override

2
packages/moxxmpp/lib/src/xeps/xep_0333.dart
View File

@ -100,7 +100,7 @@ class ChatMarkerManager extends XmppManagerBase {
callback: _onMessage,
// Before the message handler
priority: -99,
)
),
];
@override

2
packages/moxxmpp/lib/src/xeps/xep_0359.dart
View File

@ -81,7 +81,7 @@ class StableIdManager extends XmppManagerBase {
callback: _onMessage,
// Before the MessageManager
priority: -99,
)
),
];
@override

4
packages/moxxmpp/lib/src/xeps/xep_0363/xep_0363.dart
View File

@ -161,9 +161,9 @@ class HttpFileUploadManager extends XmppManagerBase {
attributes: {
'filename': filename,
'size': filesize.toString(),
...contentType != null ? {'content-type': contentType} : {}
if (contentType != null) 'content-type': contentType,
},
)
),
],
),
),

2
packages/moxxmpp/lib/src/xeps/xep_0385.dart
View File

@ -82,7 +82,7 @@ class SIMSManager extends XmppManagerBase {
tagXmlns: referenceXmlns,
// Before the message handler
priority: -99,
)
),
];
@override

2
packages/moxxmpp/lib/src/xeps/xep_0424.dart
View File

@ -31,7 +31,7 @@ class MessageRetractionManager extends XmppManagerBase {
callback: _onMessage,
// Before the MessageManager
priority: -99,
)
),
];
@override

2
packages/moxxmpp/lib/src/xeps/xep_0447.dart
View File

@ -133,7 +133,7 @@ class SFSManager extends XmppManagerBase {
callback: _onMessage,
// Before the message handler
priority: -98,
)
),
];
@override

2
packages/moxxmpp/lib/src/xeps/xep_0461.dart
View File

@ -96,7 +96,7 @@ class MessageRepliesManager extends XmppManagerBase {
callback: _onMessage,
// Before the message handler
priority: -99,
)
),
];
@override

8
packages/moxxmpp/test/sasl/scram_test.dart
View File

@ -14,9 +14,9 @@ final scramSha1StreamFeatures = XMLNode(
XMLNode(
tag: 'mechanism',
text: 'SCRAM-SHA-1',
)
),
],
)
),
],
);
final scramSha256StreamFeatures = XMLNode(
@ -29,9 +29,9 @@ final scramSha256StreamFeatures = XMLNode(
XMLNode(
tag: 'mechanism',
text: 'SCRAM-SHA-256',
)
),
],
)
),
],
);

2
packages/moxxmpp/test/stanzahandler_test.dart
View File

@ -171,7 +171,7 @@ void main() {
),
tagName: '3',
priority: 50,
)
),
]..sort(stanzaHandlerSortComparator);
expect(handlerList[0].tagName, '1');

2
packages/moxxmpp/test/xeps/xep_0060_test.dart
View File

@ -158,7 +158,7 @@ void main() {
</iq>''',
ignoreId: true,
adjustId: true,
)
),
],
);

12
packages/moxxmpp/test/xeps/xep_0115_test.dart
View File

@ -69,7 +69,7 @@ class StubbedDiscoManager extends DiscoManager {
isRequired: false,
varAttr: 'FORM_TYPE',
type: 'hidden',
)
),
],
reported: [],
items: [],
@ -153,14 +153,14 @@ void main() {
'http://jabber.org/protocol/caps',
'http://jabber.org/protocol/disco#info',
'http://jabber.org/protocol/disco#items',
'http://jabber.org/protocol/muc'
'http://jabber.org/protocol/muc',
],
const [
Identity(
category: 'client',
type: 'pc',
name: 'Exodus 0.9.1',
)
),
],
const [],
null,
@ -179,7 +179,7 @@ void main() {
'http://jabber.org/protocol/caps',
'http://jabber.org/protocol/disco#info',
'http://jabber.org/protocol/disco#items',
'http://jabber.org/protocol/muc'
'http://jabber.org/protocol/muc',
],
const [
Identity(
@ -295,14 +295,14 @@ void main() {
'urn:xmpp:message-correct:0',
'urn:xmpp:ping',
'urn:xmpp:receipts',
'urn:xmpp:time'
'urn:xmpp:time',
],
const [
Identity(
category: 'client',
type: 'phone',
name: 'Conversations',
)
),
],
const [],
null,

56
packages/moxxmpp/test/xeps/xep_0198_test.dart
View File

@ -433,10 +433,11 @@ void main() {
});
test('Test a failed stream resumption', () async {
final fakeSocket = StubTCPSocket([
StringExpectation(
"<stream:stream xmlns='jabber:client' version='1.0' xmlns:stream='http://etherx.jabber.org/streams' to='test.server' from='polynomdivision@test.server' xml:lang='en'>",
'''
final fakeSocket = StubTCPSocket(
[
StringExpectation(
"<stream:stream xmlns='jabber:client' version='1.0' xmlns:stream='http://etherx.jabber.org/streams' to='test.server' from='polynomdivision@test.server' xml:lang='en'>",
'''
<stream:stream
xmlns="jabber:client"
version="1.0"
@ -448,14 +449,14 @@ void main() {
<mechanism>PLAIN</mechanism>
</mechanisms>
</stream:features>''',
),
StringExpectation(
"<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='PLAIN'>AHBvbHlub21kaXZpc2lvbgBhYWFh</auth>",
'<success xmlns="urn:ietf:params:xml:ns:xmpp-sasl" />',
),
StringExpectation(
"<stream:stream xmlns='jabber:client' version='1.0' xmlns:stream='http://etherx.jabber.org/streams' to='test.server' from='polynomdivision@test.server' xml:lang='en'>",
'''
),
StringExpectation(
"<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='PLAIN'>AHBvbHlub21kaXZpc2lvbgBhYWFh</auth>",
'<success xmlns="urn:ietf:params:xml:ns:xmpp-sasl" />',
),
StringExpectation(
"<stream:stream xmlns='jabber:client' version='1.0' xmlns:stream='http://etherx.jabber.org/streams' to='test.server' from='polynomdivision@test.server' xml:lang='en'>",
'''
<stream:stream
xmlns="jabber:client"
version="1.0"
@ -473,21 +474,22 @@ void main() {
<sm xmlns="urn:xmpp:sm:3"/>
</stream:features>
''',
),
StringExpectation(
"<resume xmlns='urn:xmpp:sm:3' previd='id-1' h='10' />",
"<failed xmlns='urn:xmpp:sm:3' h='another-sequence-number'><item-not-found xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/></failed>",
),
StanzaExpectation(
'<iq xmlns="jabber:client" type="set" id="a"><bind xmlns="urn:ietf:params:xml:ns:xmpp-bind"/></iq>',
'<iq xmlns="jabber:client" type="result" id="a"><bind xmlns="urn:ietf:params:xml:ns:xmpp-bind"><jid>polynomdivision@test.server/MU29eEZn</jid></bind></iq>',
ignoreId: true,
),
StringExpectation(
"<enable xmlns='urn:xmpp:sm:3' resume='true' />",
'<enabled xmlns="urn:xmpp:sm:3" id="id-2" resume="true" />',
)
]);
),
StringExpectation(
"<resume xmlns='urn:xmpp:sm:3' previd='id-1' h='10' />",
"<failed xmlns='urn:xmpp:sm:3' h='another-sequence-number'><item-not-found xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/></failed>",
),
StanzaExpectation(
'<iq xmlns="jabber:client" type="set" id="a"><bind xmlns="urn:ietf:params:xml:ns:xmpp-bind"/></iq>',
'<iq xmlns="jabber:client" type="result" id="a"><bind xmlns="urn:ietf:params:xml:ns:xmpp-bind"><jid>polynomdivision@test.server/MU29eEZn</jid></bind></iq>',
ignoreId: true,
),
StringExpectation(
"<enable xmlns='urn:xmpp:sm:3' resume='true' />",
'<enabled xmlns="urn:xmpp:sm:3" id="id-2" resume="true" />',
),
],
);
final conn = XmppConnection(
TestingReconnectionPolicy(),

14
packages/moxxmpp/test/xeps/xep_0334_test.dart
View File

@ -115,17 +115,19 @@ void main() {
test('Test sending a message processing hint', () async {
final manager = MessageManager();
final holder = TestingManagerHolder(
stubSocket: StubTCPSocket([
StanzaExpectation(
'''
stubSocket: StubTCPSocket(
[
StanzaExpectation(
'''
<message to="user@example.org" type="chat">
<no-copy xmlns="urn:xmpp:hints"/>
<no-store xmlns="urn:xmpp:hints"/>
</message>
''',
'',
)
]),
'',
),
],
),
);
await holder.register([

6
packages/moxxmpp/test/xeps/xep_0363_test.dart
View File

@ -6,7 +6,7 @@ void main() {
test('invariance', () {
final headers = {
'authorization': 'Basic Base64String==',
'cookie': 'foo=bar; user=romeo'
'cookie': 'foo=bar; user=romeo',
};
expect(
prepareHeaders(headers),
@ -16,7 +16,7 @@ void main() {
test('invariance through uppercase', () {
final headers = {
'Authorization': 'Basic Base64String==',
'Cookie': 'foo=bar; user=romeo'
'Cookie': 'foo=bar; user=romeo',
};
expect(
prepareHeaders(headers),
@ -27,7 +27,7 @@ void main() {
final headers = {
'Authorization': 'Basic Base64String==',
'Cookie': 'foo=bar; user=romeo',
'X-Tracking': 'Base64String=='
'X-Tracking': 'Base64String==',
};
expect(prepareHeaders(headers), {
'Authorization': 'Basic Base64String==',