lib/main.dart

@@ -93,20 +93,6 @@ class _MyHomePageState extends State<MyHomePage> {
           // Here we take the value from the MyHomePage object that was created by
           // the App.build method, and use it to set our appbar title.
           title: Text(widget.title),
-          actions: [
-            TextButton.icon(
-                onPressed: () {
-                  ScaffoldMessenger.of(context).showSnackBar(
-                    const SnackBar(
-                        content: Text('Обновление списка тредов...')),
-                  );
-                  Provider.of<ThreadListModel>(context, listen: false).update();
-                },
-                label: const Text("Обновить"),
-                style: TextButton.styleFrom(
-                    primary: Theme.of(context).colorScheme.onPrimary),
-                icon: Icon(Icons.sync))
-          ],
         ),
         body: Center(
           child: Container(

lib/message_item_view.dart

@@ -1,28 +1,18 @@
-import 'package:enough_mail/enough_mail.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:wind/thread_model.dart';
 
 class MessageItemView extends StatelessWidget {
-  const MessageItemView(
-      {Key? key,
-      required this.item,
-      required this.isOpPost,
-      required this.isLast})
+  const MessageItemView({Key? key, required this.item, required this.isOpPost})
       : super(key: key);
 
   final MessageItem item;
   final bool isOpPost;
-  final bool isLast;
 
   @override
   Widget build(BuildContext context) {
     return Container(
-        margin: this.isOpPost
-            ? EdgeInsets.only(bottom: 10, left: 10, right: 10, top: 16)
-            : isLast
-                ? EdgeInsets.only(left: 10, right: 10, bottom: 16)
-                : EdgeInsets.only(left: 10, right: 10),
+        margin: this.isOpPost ? EdgeInsets.only(bottom: 10) : EdgeInsets.all(0),
         child: Card(
             elevation: 5,
             child: Column(
@@ -91,8 +81,6 @@ class MessageItem {
   final String date;
   final String body;
 
-  MimeMessage? originalMessage;
-
   MessageItem(
       this.id, this.number, this.subject, this.author, this.date, this.body);
 }

lib/nntp_client.dart

@@ -6,8 +6,8 @@ import 'package:tuple/tuple.dart';
 
 class NNTPClient {
   late WebSocketChannel _channel;
-  final Queue<_NNTPCommand> _commandQueue = new Queue();
-  final List<String> _tempBuffer = [];
+  final Queue<_NNTPCommand> commandQueue = new Queue();
+  final List<String> tempBuffer = [];
 
   String? currentGroup;
 
@@ -25,22 +25,22 @@ class NNTPClient {
       var respLines = resp.split("\r\n");
       if (respLines.last == "") respLines.removeLast(); // trailing empty line
 
-      if ((respLines.length > 1 || _tempBuffer.isNotEmpty) &&
+      if ((respLines.length > 1 || tempBuffer.isNotEmpty) &&
           respLines.last.codeUnits.last != ".".codeUnits.first) {
         // if it's multiline response and it doesn't contain dot in the end
         // then looks like we need to wait for next message to concatenate with current msg
-        _tempBuffer.add(resp);
+        tempBuffer.add(resp);
         return;
       }
 
-      if (_tempBuffer.isNotEmpty) {
-        _tempBuffer.add(resp);
-        resp = _tempBuffer.join();
+      if (tempBuffer.isNotEmpty) {
+        tempBuffer.add(resp);
+        resp = tempBuffer.join();
         respLines = resp.split("\r\n");
         respLines.removeLast(); // trailing empty line
-        _tempBuffer.clear();
+        tempBuffer.clear();
       }
-      var command = _commandQueue.removeFirst();
+      var command = commandQueue.removeFirst();
       var respCode = int.parse(respLines[0].split(" ")[0]);
       command.responseCompleter.complete(_CommandResponse(respCode, respLines));
     });
@@ -49,7 +49,7 @@ class NNTPClient {
   Future<_CommandResponse> _sendCommand(
       String command, List<String> args) async {
     var cmd = _NNTPCommand(_CommandRequest(command, args));
-    _commandQueue.add(cmd);
+    commandQueue.add(cmd);
     if (args.length > 0) {
       _channel.sink.add("$command ${args.join(" ")}\r\n");
     } else {
@@ -155,18 +155,6 @@ class NNTPClient {
 
     return threads;
   }
-
-  Future<int> postArticle(MimeMessage message) async {
-    var resp = await _sendCommand("POST", []);
-    if (resp.responseCode != 340) return resp.responseCode;
-    var rawMessage = message.renderMessage() + "\r\n.\r\n";
-
-    _channel.sink.add(rawMessage);
-    var cmd = _NNTPCommand(_CommandRequest("POST", []));
-    _commandQueue.add(cmd);
-    resp = await cmd.response;
-    return resp.responseCode;
-  }
 }
 
 class _NNTPCommand {

lib/thread_list_model.dart

@@ -6,8 +6,6 @@ class ThreadListModel extends ChangeNotifier {
   String currentGroup = "";
   NNTPClient? client;
   Map<String, Map<int, List<ThreadItem>>> threads = {};
-  int _pageNum = -1;
-  List<ThreadItem> _curItems = [];
 
   Future<void> selectNewsgroup(String name) async {
     if (currentGroup == name) return;
@@ -15,29 +13,27 @@ class ThreadListModel extends ChangeNotifier {
     currentGroup = name;
     await client!.selectGroup(name);
     threads.putIfAbsent(name, () => {});
-    _curItems.clear();
-    _pageNum = -1;
 
     notifyListeners();
   }
 
-  Future<List<ThreadItem>> getNewThreads(bool clearCache) async {
+  Future<List<ThreadItem>> getNewThreads(
+      int perPage, int pageNum, bool clearCache) async {
     if (currentGroup == "") return [];
-
-    _pageNum += 1;
+    List<ThreadItem> items = [];
 
     if (clearCache) {
       threads[currentGroup]?.clear();
     }
 
-    if (threads[currentGroup]!.containsKey(_pageNum)) {
-      _curItems.addAll(threads[currentGroup]![_pageNum]!);
+    if (threads[currentGroup]!.containsKey(pageNum)) {
+      items.addAll(threads[currentGroup]![pageNum]!);
     } else {
-      var resp = await client!.getNewThreads(10, _pageNum);
+      var resp = await client!.getNewThreads(perPage, pageNum);
       resp.forEach((pair) {
         var number = pair.item1;
         var msg = pair.item2;
-        _curItems.add(ThreadItem(
+        items.add(ThreadItem(
             msg.getHeaderValue("Message-Id")!,
             number,
             msg.getHeaderValue("Subject")!,
@@ -46,18 +42,9 @@ class ThreadListModel extends ChangeNotifier {
             msg.decodeTextPlainPart()!));
       });
 
-      if (resp.isEmpty) _pageNum -= 1;
-
-      threads[currentGroup]![_pageNum] = List.from(_curItems);
+      threads[currentGroup]![pageNum] = items;
     }
 
-    return _curItems;
-  }
-
-  void update() {
-    _curItems.clear();
-    _pageNum = -1;
-    threads[currentGroup]!.clear();
-    notifyListeners();
+    return items;
   }
 }

lib/thread_list_view.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:wind/thread_list_model.dart';
+import 'package:wind/thread_screen.dart';
 
 class ThreadListView extends StatefulWidget {
   @override
@@ -8,6 +9,8 @@ class ThreadListView extends StatefulWidget {
 }
 
 class ThreadListViewState extends State<ThreadListView> {
+  List<ThreadItem> _items = [];
+  int _pageNum = 0;
   String _curGroup = "";
 
   @override
@@ -21,13 +24,16 @@ class ThreadListViewState extends State<ThreadListView> {
             if (snapshot.hasData &&
                 snapshot.connectionState != ConnectionState.waiting) {
               List<ThreadItem> data = List.from(snapshot.data!);
-              if (data.isNotEmpty && data.last.number != -100500)
-                data.add(ThreadItem("", -100500, "", "", "",
+              _items.addAll(data);
+              if (_items.isNotEmpty &&
+                  _items.last.number != -100500 &&
+                  data.isNotEmpty)
+                _items.add(ThreadItem("", -100500, "", "", "",
                     "")); // magic item (for button "load more")
               return _curGroup != ""
-                  ? _threadView(data)
+                  ? _threadView()
                   : Center(
-                      child: Text("Новостная группа не выбрана",
+                      child: Text("Newsgroup is not selected",
                           style: TextStyle(
                               fontWeight: FontWeight.bold, fontSize: 16)));
             } else if (snapshot.hasError) {
@@ -40,18 +46,22 @@ class ThreadListViewState extends State<ThreadListView> {
 
   Future<List<ThreadItem>> _fetchThreadList(BuildContext context) async {
     var model = context.read<ThreadListModel>();
+    if (model.currentGroup != _curGroup) {
+      _items.clear();
       _curGroup = model.currentGroup;
-    return await model.getNewThreads(false);
+      _pageNum = 0;
+    }
+    return await model.getNewThreads(10, _pageNum, false);
   }
 
-  Widget _threadView(List<ThreadItem> items) {
-    return items.isNotEmpty
+  Widget _threadView() {
+    return _items.isNotEmpty
         ? Scrollbar(
             child: ListView.builder(
                 key: PageStorageKey("threadList"),
-                itemCount: items.length,
+                itemCount: _items.length,
                 itemBuilder: (context, index) {
-                  if (items[index].number == -100500) {
+                  if (_items[index].number == -100500) {
                     return Container(
                       height: 100,
                       padding: EdgeInsets.all(20),
@@ -62,18 +72,19 @@ class ThreadListViewState extends State<ThreadListView> {
                         ),
                         onPressed: () {
                           setState(() {
-                            items.removeLast();
+                            _pageNum += 1;
+                            _items.removeLast();
                           });
                         },
-                        child: Text('Загрузить больше'),
+                        child: Text('Load more'),
                       ),
                     );
                   } else
-                    return ThreadListItemView(item: items[index]);
+                    return ThreadListItemView(item: _items[index]);
                 }),
           )
         : Center(
-            child: Text("Эта новостная группа пуста",
+            child: Text("This newsgroup is empty",
                 style: TextStyle(fontWeight: FontWeight.bold, fontSize: 16)));
   }
 }

lib/thread_model.dart

@@ -1,4 +1,3 @@
-import 'package:enough_mail/enough_mail.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:wind/message_item_view.dart';
 import 'package:wind/nntp_client.dart';
@@ -10,15 +9,13 @@ class ThreadModel extends ChangeNotifier {
 
   Future<MessageItem> getPost(int number) async {
     var msg = await client!.getPost(number);
-    var mi = MessageItem(
+    return MessageItem(
         msg.getHeaderValue("Message-Id")!,
         number,
         msg.getHeaderValue("Subject")!,
         msg.getHeaderValue("From")!,
         msg.getHeaderValue("Date")!,
         msg.decodeTextPlainPart()!);
-    mi.originalMessage = msg;
-    return mi;
   }
 
   Future<List<MessageItem>> getThread(int threadNumber) async {
@@ -42,19 +39,4 @@ class ThreadModel extends ChangeNotifier {
 
     return items;
   }
-
-  Future<int> postMessage(MimeMessage opPost, String text) async {
-    var msg = MessageBuilder.buildSimpleTextMessage(
-        MailAddress.empty(), [], text,
-        subject: "Re: " + opPost.decodeSubject()!);
-    msg.setHeader("From", "anonymous");
-    msg.addHeader("In-Reply-To", opPost.getHeaderValue("Message-Id"));
-    msg.addHeader("References", opPost.getHeaderValue("Message-Id"));
-    msg.addHeader("Newsgroups", client!.currentGroup!);
-    return await client!.postArticle(msg);
-  }
-
-  void update() {
-    notifyListeners();
-  }
 }

lib/thread_screen.dart

@@ -1,7 +1,7 @@
-import 'package:enough_mail/mime_message.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:wind/message_item_view.dart';
+import 'package:wind/nntp_client.dart';
 import 'package:wind/thread_list_view.dart';
 import 'package:wind/thread_model.dart';
 
@@ -23,54 +23,39 @@ class ThreadScreen extends StatefulWidget {
 class ThreadScreenState extends State<ThreadScreen> {
   ThreadScreenState(this.threadNumber);
 
-  late ThreadModel model;
+  late NNTPClient client;
   late int threadNumber;
 
   @override
   Widget build(BuildContext context) {
-    model = Provider.of<ThreadModel>(context, listen: false);
+    client = context.read<NNTPClient>();
 
     return Scaffold(
       appBar: AppBar(
-        title: Text("Тред #${this.threadNumber}"),
-        actions: [
-          TextButton.icon(
-              onPressed: () {
-                ScaffoldMessenger.of(context).showSnackBar(
-                  const SnackBar(content: Text('Обновление треда...')),
-                );
-                model.update();
-              },
-              label: const Text("Обновить"),
-              style: TextButton.styleFrom(
-                  primary: Theme.of(context).colorScheme.onPrimary),
-              icon: Icon(Icons.sync))
-        ],
+        title: Text("Thread #${this.threadNumber}"),
       ),
       body: Center(
           child: Container(
-        width: 650,
-        child: Consumer<ThreadModel>(
-            builder: ((context, value, child) =>
-                FutureBuilder<List<MessageItem>>(
+        width: 640,
+        child: FutureBuilder<List<MessageItem>>(
           future: _fetch(context),
           builder: (context, snapshot) {
             if (snapshot.hasData) {
               List<MessageItem> data = List.from(snapshot.data!);
-                      data.insert(
-                          1, MessageItem("reply", 0, "", "", "", "")); // reply
+              data.insert(1, MessageItem("reply", 0, "", "", "", "")); // reply
               return _listView(data);
             } else if (snapshot.hasError) {
               return Text("${snapshot.error}");
             }
             return Center(child: CircularProgressIndicator());
           },
-                ))),
+        ),
       )),
     );
   }
 
   Future<List<MessageItem>> _fetch(BuildContext context) async {
+    var model = context.read<ThreadModel>();
     List<MessageItem> posts = [];
 
     var threadPosts = await model.getThread(threadNumber);
@@ -86,34 +71,25 @@ class ThreadScreenState extends State<ThreadScreen> {
         itemCount: data.length,
         itemBuilder: (context, index) {
           if (index == 1) {
-            return SendMessageForm(opPost: data[0].originalMessage!);
+            return SendMessageForm();
           }
-          return MessageItemView(
-              item: data[index],
-              isOpPost: index == 0,
-              isLast: index == data.length - 1);
+          return MessageItemView(item: data[index], isOpPost: index == 0);
         });
   }
 }
 
 class SendMessageForm extends StatefulWidget {
-  const SendMessageForm({Key? key, required this.opPost}) : super(key: key);
-
-  final MimeMessage opPost;
+  const SendMessageForm({Key? key}) : super(key: key);
 
   @override
   SendMessageFormState createState() {
-    return SendMessageFormState(opPost);
+    return SendMessageFormState();
   }
 }
 
 // Create a corresponding State class.
 // This class holds data related to the form.
 class SendMessageFormState extends State<SendMessageForm> {
-  SendMessageFormState(this.opPost);
-
-  final MimeMessage opPost;
-
   // Create a global key that uniquely identifies the Form widget
   // and allows validation of the form.
   //
@@ -126,8 +102,6 @@ class SendMessageFormState extends State<SendMessageForm> {
     // Build a Form widget using the _formKey created above.
     return Form(
       key: _formKey,
-      child: Container(
-        margin: EdgeInsets.only(left: 16, right: 16),
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
@@ -140,18 +114,16 @@ class SendMessageFormState extends State<SendMessageForm> {
                         keyboardType: TextInputType.multiline,
                         maxLines: null,
                         decoration: InputDecoration(
-                              border: OutlineInputBorder(),
-                              labelText: "Комментарий"),
+                            border: OutlineInputBorder(), labelText: "Comment"),
                         // The validator receives the text that the user has entered.
                         validator: (value) {
                           if (value == null || value.isEmpty) {
-                              return 'Пожалуйста, введите текст';
+                            return 'Please enter some text';
                           }
                           return null;
                         },
                       ))),
-                Consumer<ThreadModel>(
-                  builder: (((context, value, child) => Padding(
+              Padding(
                   padding: const EdgeInsets.symmetric(vertical: 16.0),
                   child: Row(
                       mainAxisAlignment: MainAxisAlignment.start,
@@ -160,34 +132,21 @@ class SendMessageFormState extends State<SendMessageForm> {
                           onPressed: () {
                             // Validate returns true if the form is valid, or false otherwise.
                             if (_formKey.currentState!.validate()) {
-                                  Provider.of<ThreadModel>(context,
-                                          listen: false)
-                                      .postMessage(opPost,
-                                          value.commentTextController.text)
-                                      .then((responseCode) {
-                                    if (responseCode == 240) {
-                                      ScaffoldMessenger.of(context)
-                                          .showSnackBar(
+                              // If the form is valid, display a snackbar. In the real world,
+                              // you'd often call a server or save the information in a database.
+                              ScaffoldMessenger.of(context).showSnackBar(
                                 const SnackBar(
-                                            content: Text('Пост отправлен!')),
+                                    content: Text('Processing Data')),
                               );
-                                      Provider.of<ThreadModel>(context,
-                                              listen: false)
-                                          .update();
-                                    }
-                                  });
-                                  value.commentTextController.text = "";
                             }
                           },
-                              child: const Text('Отправить'),
-                            )
-                          ])))),
+                          child: const Text('Send'),
                         )
+                      ]))
             ]),
           )
         ],
       ),
-      ),
     );
   }
 }