Erweiterungen

lib/model/chat_message.dart

@@ -3,11 +3,11 @@ import 'package:json_annotation/json_annotation.dart';
 import 'package:stadtbote/main.dart';
 import 'package:stadtbote/tools/util.dart';
 
-part 'message.g.dart';
+part 'chat_message.g.dart';
 
 @collection
 @JsonSerializable()
-class Message {
+class ChatMessage {
   late Id id;
 
   late String time;
@@ -20,14 +20,14 @@ class Message {
 
   late bool? read = false;
 
-  Message();
+  ChatMessage();
 
-  factory Message.fromJson(Map<String, dynamic> json) => _$MessageFromJson(json);
+  factory ChatMessage.fromJson(Map<String, dynamic> json) => _$ChatMessageFromJson(json);
 
-  Map<String, dynamic> toJson() => _$MessageToJson(this);
+  Map<String, dynamic> toJson() => _$ChatMessageToJson(this);
 
-  static Future<Message> mergeFromJson(Map<String, dynamic> json) async {
-    var availableMessage = await MyApp.isarInstance.messages.filter().idEqualTo(json["id"]).findFirst();
+  static Future<ChatMessage> mergeFromJson(Map<String, dynamic> json) async {
+    var availableMessage = await MyApp.isarInstance.chatMessages.filter().idEqualTo(json["id"]).findFirst();
 
     if (availableMessage != null) {
       availableMessage.id = json["id"];
@@ -38,7 +38,7 @@ class Message {
 
       return availableMessage;
     } else {
-      var message = Message.fromJson(json);
+      var message = ChatMessage.fromJson(json);
       message.read = false;
 
       return message;

lib/model/chat_message.g.dart

@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'message.dart';
+part of 'chat_message.dart';
 
 // **************************************************************************
 // IsarCollectionGenerator
@@ -9,13 +9,13 @@ part of 'message.dart';
 // coverage:ignore-file
 // ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types
 
-extension GetMessageCollection on Isar {
-  IsarCollection<Message> get messages => this.collection();
+extension GetChatMessageCollection on Isar {
+  IsarCollection<ChatMessage> get chatMessages => this.collection();
 }
 
-const MessageSchema = CollectionSchema(
-  name: r'Message',
-  id: 2463283977299753079,
+const ChatMessageSchema = CollectionSchema(
+  name: r'ChatMessage',
+  id: 35366979330584919,
   properties: {
     r'from': PropertySchema(
       id: 0,
@@ -43,22 +43,22 @@ const MessageSchema = CollectionSchema(
       type: IsarType.string,
     )
   },
-  estimateSize: _messageEstimateSize,
-  serialize: _messageSerialize,
-  deserialize: _messageDeserialize,
-  deserializeProp: _messageDeserializeProp,
+  estimateSize: _chatMessageEstimateSize,
+  serialize: _chatMessageSerialize,
+  deserialize: _chatMessageDeserialize,
+  deserializeProp: _chatMessageDeserializeProp,
   idName: r'id',
   indexes: {},
   links: {},
   embeddedSchemas: {},
-  getId: _messageGetId,
-  getLinks: _messageGetLinks,
-  attach: _messageAttach,
+  getId: _chatMessageGetId,
+  getLinks: _chatMessageGetLinks,
+  attach: _chatMessageAttach,
   version: '3.1.0+1',
 );
 
-int _messageEstimateSize(
-  Message object,
+int _chatMessageEstimateSize(
+  ChatMessage object,
   List<int> offsets,
   Map<Type, List<int>> allOffsets,
 ) {
@@ -70,8 +70,8 @@ int _messageEstimateSize(
   return bytesCount;
 }
 
-void _messageSerialize(
-  Message object,
+void _chatMessageSerialize(
+  ChatMessage object,
   IsarWriter writer,
   List<int> offsets,
   Map<Type, List<int>> allOffsets,
@@ -83,13 +83,13 @@ void _messageSerialize(
   writer.writeString(offsets[4], object.time);
 }
 
-Message _messageDeserialize(
+ChatMessage _chatMessageDeserialize(
   Id id,
   IsarReader reader,
   List<int> offsets,
   Map<Type, List<int>> allOffsets,
 ) {
-  final object = Message();
+  final object = ChatMessage();
   object.from = reader.readString(offsets[0]);
   object.id = id;
   object.read = reader.readBoolOrNull(offsets[1]);
@@ -99,7 +99,7 @@ Message _messageDeserialize(
   return object;
 }
 
-P _messageDeserializeProp<P>(
+P _chatMessageDeserializeProp<P>(
   IsarReader reader,
   int propertyId,
   int offset,
@@ -121,28 +121,31 @@ P _messageDeserializeProp<P>(
   }
 }
 
-Id _messageGetId(Message object) {
+Id _chatMessageGetId(ChatMessage object) {
   return object.id;
 }
 
-List<IsarLinkBase<dynamic>> _messageGetLinks(Message object) {
+List<IsarLinkBase<dynamic>> _chatMessageGetLinks(ChatMessage object) {
   return [];
 }
 
-void _messageAttach(IsarCollection<dynamic> col, Id id, Message object) {
+void _chatMessageAttach(
+    IsarCollection<dynamic> col, Id id, ChatMessage object) {
   object.id = id;
 }
 
-extension MessageQueryWhereSort on QueryBuilder<Message, Message, QWhere> {
-  QueryBuilder<Message, Message, QAfterWhere> anyId() {
+extension ChatMessageQueryWhereSort
+    on QueryBuilder<ChatMessage, ChatMessage, QWhere> {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterWhere> anyId() {
     return QueryBuilder.apply(this, (query) {
       return query.addWhereClause(const IdWhereClause.any());
     });
   }
 }
 
-extension MessageQueryWhere on QueryBuilder<Message, Message, QWhereClause> {
-  QueryBuilder<Message, Message, QAfterWhereClause> idEqualTo(Id id) {
+extension ChatMessageQueryWhere
+    on QueryBuilder<ChatMessage, ChatMessage, QWhereClause> {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterWhereClause> idEqualTo(Id id) {
     return QueryBuilder.apply(this, (query) {
       return query.addWhereClause(IdWhereClause.between(
         lower: id,
@@ -151,7 +154,8 @@ extension MessageQueryWhere on QueryBuilder<Message, Message, QWhereClause> {
     });
   }
 
-  QueryBuilder<Message, Message, QAfterWhereClause> idNotEqualTo(Id id) {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterWhereClause> idNotEqualTo(
+      Id id) {
     return QueryBuilder.apply(this, (query) {
       if (query.whereSort == Sort.asc) {
         return query
@@ -173,7 +177,7 @@ extension MessageQueryWhere on QueryBuilder<Message, Message, QWhereClause> {
     });
   }
 
-  QueryBuilder<Message, Message, QAfterWhereClause> idGreaterThan(Id id,
+  QueryBuilder<ChatMessage, ChatMessage, QAfterWhereClause> idGreaterThan(Id id,
       {bool include = false}) {
     return QueryBuilder.apply(this, (query) {
       return query.addWhereClause(
@@ -182,7 +186,7 @@ extension MessageQueryWhere on QueryBuilder<Message, Message, QWhereClause> {
     });
   }
 
-  QueryBuilder<Message, Message, QAfterWhereClause> idLessThan(Id id,
+  QueryBuilder<ChatMessage, ChatMessage, QAfterWhereClause> idLessThan(Id id,
       {bool include = false}) {
     return QueryBuilder.apply(this, (query) {
       return query.addWhereClause(
@@ -191,7 +195,7 @@ extension MessageQueryWhere on QueryBuilder<Message, Message, QWhereClause> {
     });
   }
 
-  QueryBuilder<Message, Message, QAfterWhereClause> idBetween(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterWhereClause> idBetween(
     Id lowerId,
     Id upperId, {
     bool includeLower = true,
@@ -208,9 +212,9 @@ extension MessageQueryWhere on QueryBuilder<Message, Message, QWhereClause> {
   }
 }
 
-extension MessageQueryFilter
-    on QueryBuilder<Message, Message, QFilterCondition> {
-  QueryBuilder<Message, Message, QAfterFilterCondition> fromEqualTo(
+extension ChatMessageQueryFilter
+    on QueryBuilder<ChatMessage, ChatMessage, QFilterCondition> {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> fromEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -223,7 +227,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> fromGreaterThan(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> fromGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -238,7 +242,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> fromLessThan(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> fromLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -253,7 +257,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> fromBetween(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> fromBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -272,7 +276,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> fromStartsWith(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> fromStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -285,7 +289,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> fromEndsWith(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> fromEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -298,7 +302,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> fromContains(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> fromContains(
       String value,
       {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
@@ -310,7 +314,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> fromMatches(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> fromMatches(
       String pattern,
       {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
@@ -322,7 +326,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> fromIsEmpty() {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> fromIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
         property: r'from',
@@ -331,7 +335,8 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> fromIsNotEmpty() {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition>
+      fromIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         property: r'from',
@@ -340,7 +345,8 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> idEqualTo(Id value) {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> idEqualTo(
+      Id value) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
         property: r'id',
@@ -349,7 +355,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> idGreaterThan(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> idGreaterThan(
     Id value, {
     bool include = false,
   }) {
@@ -362,7 +368,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> idLessThan(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> idLessThan(
     Id value, {
     bool include = false,
   }) {
@@ -375,7 +381,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> idBetween(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> idBetween(
     Id lower,
     Id upper, {
     bool includeLower = true,
@@ -392,7 +398,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> readIsNull() {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> readIsNull() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(const FilterCondition.isNull(
         property: r'read',
@@ -400,7 +406,8 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> readIsNotNull() {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition>
+      readIsNotNull() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(const FilterCondition.isNotNull(
         property: r'read',
@@ -408,7 +415,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> readEqualTo(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> readEqualTo(
       bool? value) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
@@ -418,7 +425,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> subjEqualTo(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> subjEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -431,7 +438,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> subjGreaterThan(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> subjGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -446,7 +453,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> subjLessThan(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> subjLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -461,7 +468,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> subjBetween(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> subjBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -480,7 +487,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> subjStartsWith(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> subjStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -493,7 +500,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> subjEndsWith(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> subjEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -506,7 +513,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> subjContains(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> subjContains(
       String value,
       {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
@@ -518,7 +525,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> subjMatches(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> subjMatches(
       String pattern,
       {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
@@ -530,7 +537,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> subjIsEmpty() {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> subjIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
         property: r'subj',
@@ -539,7 +546,8 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> subjIsNotEmpty() {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition>
+      subjIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         property: r'subj',
@@ -548,7 +556,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> textEqualTo(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> textEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -561,7 +569,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> textGreaterThan(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> textGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -576,7 +584,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> textLessThan(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> textLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -591,7 +599,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> textBetween(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> textBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -610,7 +618,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> textStartsWith(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> textStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -623,7 +631,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> textEndsWith(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> textEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -636,7 +644,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> textContains(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> textContains(
       String value,
       {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
@@ -648,7 +656,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> textMatches(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> textMatches(
       String pattern,
       {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
@@ -660,7 +668,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> textIsEmpty() {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> textIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
         property: r'text',
@@ -669,7 +677,8 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> textIsNotEmpty() {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition>
+      textIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         property: r'text',
@@ -678,7 +687,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> timeEqualTo(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> timeEqualTo(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -691,7 +700,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> timeGreaterThan(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> timeGreaterThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -706,7 +715,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> timeLessThan(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> timeLessThan(
     String value, {
     bool include = false,
     bool caseSensitive = true,
@@ -721,7 +730,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> timeBetween(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> timeBetween(
     String lower,
     String upper, {
     bool includeLower = true,
@@ -740,7 +749,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> timeStartsWith(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> timeStartsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -753,7 +762,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> timeEndsWith(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> timeEndsWith(
     String value, {
     bool caseSensitive = true,
   }) {
@@ -766,7 +775,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> timeContains(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> timeContains(
       String value,
       {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
@@ -778,7 +787,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> timeMatches(
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> timeMatches(
       String pattern,
       {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
@@ -790,7 +799,7 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> timeIsEmpty() {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition> timeIsEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
         property: r'time',
@@ -799,7 +808,8 @@ extension MessageQueryFilter
     });
   }
 
-  QueryBuilder<Message, Message, QAfterFilterCondition> timeIsNotEmpty() {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterFilterCondition>
+      timeIsNotEmpty() {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.greaterThan(
         property: r'time',
@@ -809,179 +819,180 @@ extension MessageQueryFilter
   }
 }
 
-extension MessageQueryObject
-    on QueryBuilder<Message, Message, QFilterCondition> {}
+extension ChatMessageQueryObject
+    on QueryBuilder<ChatMessage, ChatMessage, QFilterCondition> {}
 
-extension MessageQueryLinks
-    on QueryBuilder<Message, Message, QFilterCondition> {}
+extension ChatMessageQueryLinks
+    on QueryBuilder<ChatMessage, ChatMessage, QFilterCondition> {}
 
-extension MessageQuerySortBy on QueryBuilder<Message, Message, QSortBy> {
-  QueryBuilder<Message, Message, QAfterSortBy> sortByFrom() {
+extension ChatMessageQuerySortBy
+    on QueryBuilder<ChatMessage, ChatMessage, QSortBy> {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterSortBy> sortByFrom() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'from', Sort.asc);
     });
   }
 
-  QueryBuilder<Message, Message, QAfterSortBy> sortByFromDesc() {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterSortBy> sortByFromDesc() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'from', Sort.desc);
     });
   }
 
-  QueryBuilder<Message, Message, QAfterSortBy> sortByRead() {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterSortBy> sortByRead() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'read', Sort.asc);
     });
   }
 
-  QueryBuilder<Message, Message, QAfterSortBy> sortByReadDesc() {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterSortBy> sortByReadDesc() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'read', Sort.desc);
     });
   }
 
-  QueryBuilder<Message, Message, QAfterSortBy> sortBySubj() {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterSortBy> sortBySubj() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'subj', Sort.asc);
     });
   }
 
-  QueryBuilder<Message, Message, QAfterSortBy> sortBySubjDesc() {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterSortBy> sortBySubjDesc() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'subj', Sort.desc);
     });
   }
 
-  QueryBuilder<Message, Message, QAfterSortBy> sortByText() {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterSortBy> sortByText() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'text', Sort.asc);
     });
   }
 
-  QueryBuilder<Message, Message, QAfterSortBy> sortByTextDesc() {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterSortBy> sortByTextDesc() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'text', Sort.desc);
     });
   }
 
-  QueryBuilder<Message, Message, QAfterSortBy> sortByTime() {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterSortBy> sortByTime() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'time', Sort.asc);
     });
   }
 
-  QueryBuilder<Message, Message, QAfterSortBy> sortByTimeDesc() {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterSortBy> sortByTimeDesc() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'time', Sort.desc);
     });
   }
 }
 
-extension MessageQuerySortThenBy
-    on QueryBuilder<Message, Message, QSortThenBy> {
-  QueryBuilder<Message, Message, QAfterSortBy> thenByFrom() {
+extension ChatMessageQuerySortThenBy
+    on QueryBuilder<ChatMessage, ChatMessage, QSortThenBy> {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterSortBy> thenByFrom() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'from', Sort.asc);
     });
   }
 
-  QueryBuilder<Message, Message, QAfterSortBy> thenByFromDesc() {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterSortBy> thenByFromDesc() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'from', Sort.desc);
     });
   }
 
-  QueryBuilder<Message, Message, QAfterSortBy> thenById() {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterSortBy> thenById() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'id', Sort.asc);
     });
   }
 
-  QueryBuilder<Message, Message, QAfterSortBy> thenByIdDesc() {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterSortBy> thenByIdDesc() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'id', Sort.desc);
     });
   }
 
-  QueryBuilder<Message, Message, QAfterSortBy> thenByRead() {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterSortBy> thenByRead() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'read', Sort.asc);
     });
   }
 
-  QueryBuilder<Message, Message, QAfterSortBy> thenByReadDesc() {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterSortBy> thenByReadDesc() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'read', Sort.desc);
     });
   }
 
-  QueryBuilder<Message, Message, QAfterSortBy> thenBySubj() {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterSortBy> thenBySubj() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'subj', Sort.asc);
     });
   }
 
-  QueryBuilder<Message, Message, QAfterSortBy> thenBySubjDesc() {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterSortBy> thenBySubjDesc() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'subj', Sort.desc);
     });
   }
 
-  QueryBuilder<Message, Message, QAfterSortBy> thenByText() {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterSortBy> thenByText() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'text', Sort.asc);
     });
   }
 
-  QueryBuilder<Message, Message, QAfterSortBy> thenByTextDesc() {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterSortBy> thenByTextDesc() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'text', Sort.desc);
     });
   }
 
-  QueryBuilder<Message, Message, QAfterSortBy> thenByTime() {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterSortBy> thenByTime() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'time', Sort.asc);
     });
   }
 
-  QueryBuilder<Message, Message, QAfterSortBy> thenByTimeDesc() {
+  QueryBuilder<ChatMessage, ChatMessage, QAfterSortBy> thenByTimeDesc() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'time', Sort.desc);
     });
   }
 }
 
-extension MessageQueryWhereDistinct
-    on QueryBuilder<Message, Message, QDistinct> {
-  QueryBuilder<Message, Message, QDistinct> distinctByFrom(
+extension ChatMessageQueryWhereDistinct
+    on QueryBuilder<ChatMessage, ChatMessage, QDistinct> {
+  QueryBuilder<ChatMessage, ChatMessage, QDistinct> distinctByFrom(
       {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addDistinctBy(r'from', caseSensitive: caseSensitive);
     });
   }
 
-  QueryBuilder<Message, Message, QDistinct> distinctByRead() {
+  QueryBuilder<ChatMessage, ChatMessage, QDistinct> distinctByRead() {
     return QueryBuilder.apply(this, (query) {
       return query.addDistinctBy(r'read');
     });
   }
 
-  QueryBuilder<Message, Message, QDistinct> distinctBySubj(
+  QueryBuilder<ChatMessage, ChatMessage, QDistinct> distinctBySubj(
       {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addDistinctBy(r'subj', caseSensitive: caseSensitive);
     });
   }
 
-  QueryBuilder<Message, Message, QDistinct> distinctByText(
+  QueryBuilder<ChatMessage, ChatMessage, QDistinct> distinctByText(
       {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addDistinctBy(r'text', caseSensitive: caseSensitive);
     });
   }
 
-  QueryBuilder<Message, Message, QDistinct> distinctByTime(
+  QueryBuilder<ChatMessage, ChatMessage, QDistinct> distinctByTime(
       {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
       return query.addDistinctBy(r'time', caseSensitive: caseSensitive);
@@ -989,39 +1000,39 @@ extension MessageQueryWhereDistinct
   }
 }
 
-extension MessageQueryProperty
-    on QueryBuilder<Message, Message, QQueryProperty> {
-  QueryBuilder<Message, int, QQueryOperations> idProperty() {
+extension ChatMessageQueryProperty
+    on QueryBuilder<ChatMessage, ChatMessage, QQueryProperty> {
+  QueryBuilder<ChatMessage, int, QQueryOperations> idProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addPropertyName(r'id');
     });
   }
 
-  QueryBuilder<Message, String, QQueryOperations> fromProperty() {
+  QueryBuilder<ChatMessage, String, QQueryOperations> fromProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addPropertyName(r'from');
     });
   }
 
-  QueryBuilder<Message, bool?, QQueryOperations> readProperty() {
+  QueryBuilder<ChatMessage, bool?, QQueryOperations> readProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addPropertyName(r'read');
     });
   }
 
-  QueryBuilder<Message, String, QQueryOperations> subjProperty() {
+  QueryBuilder<ChatMessage, String, QQueryOperations> subjProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addPropertyName(r'subj');
     });
   }
 
-  QueryBuilder<Message, String, QQueryOperations> textProperty() {
+  QueryBuilder<ChatMessage, String, QQueryOperations> textProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addPropertyName(r'text');
     });
   }
 
-  QueryBuilder<Message, String, QQueryOperations> timeProperty() {
+  QueryBuilder<ChatMessage, String, QQueryOperations> timeProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addPropertyName(r'time');
     });
@@ -1032,15 +1043,16 @@ extension MessageQueryProperty
 // JsonSerializableGenerator
 // **************************************************************************
 
-Message _$MessageFromJson(Map<String, dynamic> json) => Message()
-  ..id = json['id'] as int
+ChatMessage _$ChatMessageFromJson(Map<String, dynamic> json) => ChatMessage()
+  ..id = (json['id'] as num).toInt()
   ..time = json['time'] as String
   ..from = json['from'] as String
   ..subj = json['subj'] as String
   ..text = json['text'] as String
   ..read = json['read'] as bool?;
 
-Map<String, dynamic> _$MessageToJson(Message instance) => <String, dynamic>{
+Map<String, dynamic> _$ChatMessageToJson(ChatMessage instance) =>
+    <String, dynamic>{
       'id': instance.id,
       'time': instance.time,
       'from': instance.from,

lib/model/job.dart

@@ -1,3 +1,4 @@
+import 'package:dart_mq/dart_mq.dart';
 import 'package:isar/isar.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:stadtbote/model/job_tour.dart';
@@ -8,7 +9,7 @@ part 'job.g.dart';
 
 @collection
 @JsonSerializable()
-class Job {
+class Job with ProducerMixin {
   late Id id;
   @JsonKey(name: 'ver')
   late String ver;

lib/model/job.g.dart

@@ -1546,16 +1546,16 @@ extension JobQueryProperty on QueryBuilder<Job, Job, QQueryProperty> {
 // **************************************************************************
 
 Job _$JobFromJson(Map<String, dynamic> json) => Job()
-  ..id = json['id'] as int
+  ..id = (json['id'] as num).toInt()
   ..ver = json['ver'] as String
-  ..state = json['state'] as int
+  ..state = (json['state'] as num).toInt()
   ..crFilter = json['cr_filter'] as String?
   ..ordertime = json['ordertime'] as String
-  ..offsWarn = json['offs_warn'] as int
+  ..offsWarn = (json['offs_warn'] as num).toInt()
   ..global = json['global'] as bool
-  ..vhtId = json['vht_id'] as int
+  ..vhtId = (json['vht_id'] as num).toInt()
   ..rem = json['rem'] as String
-  ..delayOrderTime = json['delayOrderTime'] as int
+  ..delayOrderTime = (json['delayOrderTime'] as num).toInt()
   ..tours = (json['tours'] as List<dynamic>)
       .map((e) => JobTour.fromJson(e as Map<String, dynamic>))
       .toList();

lib/model/job_tour.g.dart

@@ -1615,9 +1615,9 @@ extension JobTourQueryObject
 // **************************************************************************
 
 JobTour _$JobTourFromJson(Map<String, dynamic> json) => JobTour()
-  ..id = json['id'] as int
-  ..sort = json['sort'] as int
-  ..state = json['state'] as int
+  ..id = (json['id'] as num).toInt()
+  ..sort = (json['sort'] as num).toInt()
+  ..state = (json['state'] as num).toInt()
   ..mode = json['mode'] as String
   ..comp = json['comp'] as String
   ..person = json['person'] as String

lib/model/location_status.g.dart

@@ -835,7 +835,7 @@ extension LocationStatusQueryProperty
 
 LocationStatus _$LocationStatusFromJson(Map<String, dynamic> json) =>
     LocationStatus()
-      ..id = json['id'] as int?
+      ..id = (json['id'] as num?)?.toInt()
       ..zip = json['zip'] as String
       ..area = json['area'] as String
       ..zipReal = json['zip_real'] as String;

lib/model/log_entry.g.dart

@@ -643,7 +643,7 @@ extension LogEntryQueryProperty
 // **************************************************************************
 
 LogEntry _$LogEntryFromJson(Map<String, dynamic> json) => LogEntry()
-  ..id = json['id'] as int
+  ..id = (json['id'] as num).toInt()
   ..time = DateTime.parse(json['time'] as String)
   ..severity = $enumDecode(_$LogEntrySeverityEnumEnumMap, json['severity'])
   ..text = json['text'] as String;

lib/model/rank.g.dart

@@ -1240,7 +1240,7 @@ extension VehicleQueryObject
 // **************************************************************************
 
 Ranking _$RankingFromJson(Map<String, dynamic> json) => Ranking()
-  ..id = json['id'] as int?
+  ..id = (json['id'] as num?)?.toInt()
   ..ranks = (json['ranking'] as List<dynamic>)
       .map((e) => Rank.fromJson(e as Map<String, dynamic>))
       .toList();
@@ -1251,7 +1251,7 @@ Map<String, dynamic> _$RankingToJson(Ranking instance) => <String, dynamic>{
     };
 
 Rank _$RankFromJson(Map<String, dynamic> json) => Rank()
-  ..id = json['id'] as int
+  ..id = (json['id'] as num).toInt()
   ..zip = json['zip'] as String
   ..area = json['area'] as String?
   ..vehicles = (json['vehicles'] as List<dynamic>)
@@ -1266,9 +1266,9 @@ Map<String, dynamic> _$RankToJson(Rank instance) => <String, dynamic>{
     };
 
 Vehicle _$VehicleFromJson(Map<String, dynamic> json) => Vehicle()
-  ..id = json['id'] as int
-  ..type = json['type'] as int
-  ..cnt = json['cnt'] as int?
+  ..id = (json['id'] as num).toInt()
+  ..type = (json['type'] as num).toInt()
+  ..cnt = (json['cnt'] as num?)?.toInt()
   ..self = json['self'] as bool? ?? false;
 
 Map<String, dynamic> _$VehicleToJson(Vehicle instance) => <String, dynamic>{

lib/model/session_status.g.dart

@@ -1507,12 +1507,12 @@ extension SessionStatusQueryProperty
 
 SessionStatus _$SessionStatusFromJson(Map<String, dynamic> json) =>
     SessionStatus()
-      ..custId = json['cust_id'] as int
-      ..hqId = json['hq_id'] as int
-      ..usrId = json['usr_id'] as int
-      ..crId = json['cr_id'] as int
+      ..custId = (json['cust_id'] as num).toInt()
+      ..hqId = (json['hq_id'] as num).toInt()
+      ..usrId = (json['usr_id'] as num).toInt()
+      ..crId = (json['cr_id'] as num).toInt()
       ..sid = json['sid'] as String
-      ..vhtId = json['vht_id'] as int
+      ..vhtId = (json['vht_id'] as num).toInt()
       ..locZip = json['loc_zip'] as String
       ..serverVersion = json['server_version'] as String
       ..serverInstance = json['server_instance'] as String;

lib/model/status.g.dart

@@ -789,7 +789,7 @@ extension StatusPosQueryObject
 // **************************************************************************
 
 Status _$StatusFromJson(Map<String, dynamic> json) => Status()
-  ..id = json['id'] as int?
+  ..id = (json['id'] as num?)?.toInt()
   ..pos = StatusPos.fromJson(json['pos'] as Map<String, dynamic>);
 
 Map<String, dynamic> _$StatusToJson(Status instance) => <String, dynamic>{

lib/model/tour_task.g.dart

@@ -1456,19 +1456,19 @@ extension TourEntryQueryObject
 // **************************************************************************
 
 TourTask _$TourTaskFromJson(Map<String, dynamic> json) => TourTask()
-  ..sId = json['s_id'] as int
-  ..type = json['type'] as int
+  ..sId = (json['s_id'] as num).toInt()
+  ..type = (json['type'] as num).toInt()
   ..topic = json['topic'] as String
   ..opt = json['opt'] as bool? ?? false
   ..reenter = json['reenter'] as bool? ?? false
-  ..min = json['min'] as int?
-  ..max = json['max'] as int?
-  ..maxLen = json['max_len'] as int?
+  ..min = (json['min'] as num?)?.toInt()
+  ..max = (json['max'] as num?)?.toInt()
+  ..maxLen = (json['max_len'] as num?)?.toInt()
   ..rt = json['rt'] as bool?
   ..track = json['track'] as bool?
   ..txt = json['txt'] as String?
-  ..taskArrival = json['task_arrival'] as int?
-  ..taskFinWork = json['task_fin_work'] as int?
+  ..taskArrival = (json['task_arrival'] as num?)?.toInt()
+  ..taskFinWork = (json['task_fin_work'] as num?)?.toInt()
   ..entries = (json['entries'] as List<dynamic>?)
       ?.map((e) => TourEntry.fromJson(e as Map<String, dynamic>))
       .toList();
@@ -1491,7 +1491,7 @@ Map<String, dynamic> _$TourTaskToJson(TourTask instance) => <String, dynamic>{
     };
 
 TourEntry _$TourEntryFromJson(Map<String, dynamic> json) => TourEntry()
-  ..code = json['code'] as int
+  ..code = (json['code'] as num).toInt()
   ..text = json['text'] as String
   ..queryRemark = json['query_remark'] as bool;