TelegramBot is ready

Author: T1GIT

src/main/java/attestation_2/weatherBot/Subscribers.java

@@ -5,36 +5,37 @@
 
 public class Subscribers extends Thread {
     private static final Calendar day = Calendar.getInstance();
-    private static final int[] time = new int[]{12, 0, 0};
-    private static final long period = TimeUnit.MILLISECONDS.convert(30, TimeUnit.SECONDS);
-    private final HashMap<String, User> subscribers;
+    private static final int[] time = new int[]{9, 0, 0};
+    private static final long period = TimeUnit.MILLISECONDS.convert(1, TimeUnit.DAYS);
+    private final HashSet<User> subscribers;
     private final Timer timer;
 
     public Subscribers() {
-        subscribers = new HashMap<>();
+        subscribers = new HashSet<>();
         day.set(Calendar.HOUR_OF_DAY, time[0]);
         day.set(Calendar.MINUTE, time[1]);
         day.set(Calendar.SECOND, time[2]);
         timer = new Timer();
     }
 
     public void add(User user) {
-        this.subscribers.put(user.getChatId(), user);
+        this.subscribers.add(user);
     }
 
     public void remove(User user) {
-        this.subscribers.remove(user.getChatId());
+        this.subscribers.remove(user);
     }
 
-    public boolean hasId(String id) { return this.subscribers.containsKey(id); }
+    public boolean contains(User user) { return this.subscribers.contains(user); }
 
     @Override
     public void start() {
         timer.schedule(new TimerTask() {
             @Override
             public void run() {
-                for (Map.Entry<String, User> entry: subscribers.entrySet()) {
-                    entry.getValue().sendCurrent();
+                for (User user: subscribers) {
+                    System.out.println(user);
+                    user.sendCurrent();
                 }
             }
         }, day.getTime(), period);

src/main/java/attestation_2/weatherBot/TelegramBot.java

@@ -28,6 +28,7 @@ public TelegramBot() {
         super();
         User.setTelegramBot(this);
         User.setWeatherGetter(weatherGetter);
+        User.setSubscribers(subscribers);
         subscribers.start();
     }
 
@@ -111,11 +112,11 @@ public void command(User user, String command) {
         }
     }
 
-    public void sendMsg(String id, String text, boolean withMenu) {
+    public void sendMsg(User user, String text) {
         try {
             SendMessage outMsg = new SendMessage();
-            setKeyBoard(outMsg, subscribers.hasId(id), withMenu);
-            outMsg.setChatId(id);
+            setKeyBoard(outMsg, user.isSubscribed(), user.hasLocation());
+            outMsg.setChatId(user.getChatId());
             outMsg.setText(text);
             outMsg.setParseMode("HTML");
             execute(outMsg);

src/main/java/attestation_2/weatherBot/User.java

@@ -3,11 +3,12 @@
 import java.io.IOException;
 
 public class User {
+    private static Subscribers subscribers;
     private static TelegramBot telegramBot;
     private static WeatherGetter weatherGetter;
     private final String chatId;
     private String name;
-    private String location = null;
+    private String location;
 
     public static void setWeatherGetter(WeatherGetter weatherGetter) {
         User.weatherGetter = weatherGetter;
@@ -17,6 +18,10 @@ public static void setTelegramBot(TelegramBot telegramBot) {
         User.telegramBot = telegramBot;
     }
 
+    public static void setSubscribers(Subscribers subscribers) {
+        User.subscribers = subscribers;
+    }
+
     public String getChatId() {
         return chatId;
     }
@@ -29,6 +34,10 @@ public String getLocation() {
         return location;
     }
 
+    public boolean isSubscribed() {
+        return subscribers.contains(this);
+    }
+
     public void setLocation(String location) {
         this.location = location;
     }
@@ -46,17 +55,23 @@ public boolean hasLocation() {
         return this.getLocation() != null;
     }
 
+    public void setSubscribed(boolean val) {
+        if (val) {
+            subscribers.add(this);
+        } else {
+            subscribers.remove(this);
+        }
+    }
+
     public void send(String text) {
-        System.out.println(hasLocation());
-        System.out.println(location);
-        telegramBot.sendMsg(chatId, text, hasLocation());
+        telegramBot.sendMsg(this, text);
     }
 
     public void sendCurrent() {
         try {
             String jsonString = weatherGetter.getCurrent(getLocation());
             String outText = Parser.current(jsonString);
-            telegramBot.sendMsg(chatId, outText, true);
+            telegramBot.sendMsg(this, outText);
         } catch (IOException e) {
             e.printStackTrace();
         }