Skip to content

Commit 2e4d115

Browse files
committed
modify: rename SimpleSpeaker.java
1 parent a7c6828 commit 2e4d115

File tree

9 files changed

+34
-19
lines changed

9 files changed

+34
-19
lines changed

src/main/java/top/focess/qq/api/bot/Friend.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import org.jetbrains.annotations.NotNull;
44

5-
public interface Friend extends Speaker{
5+
public interface Friend extends Transmitter {
66

77
/**
88
* Get the friend's raw name (its nickname)

src/main/java/top/focess/qq/api/bot/Group.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import java.util.List;
66

7-
public interface Group extends Speaker{
7+
public interface Group extends Transmitter {
88

99
/**
1010
* Quit the group

src/main/java/top/focess/qq/api/bot/Speaker.java

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/main/java/top/focess/qq/api/bot/Stranger.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package top.focess.qq.api.bot;
22

3-
public interface Stranger extends Speaker{
3+
public interface Stranger extends Transmitter {
44

55
/**
66
* Get the stranger's raw name (its nickname)
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package top.focess.qq.api.bot;
2+
3+
import net.mamoe.mirai.message.data.Image;
4+
import net.mamoe.mirai.message.data.Message;
5+
import net.mamoe.mirai.utils.ExternalResource;
6+
7+
public interface Transmitter extends Contact{
8+
9+
@Deprecated
10+
void sendMessage(String message);
11+
12+
@Deprecated
13+
void sendMessage(Message message);
14+
15+
@Deprecated
16+
Image uploadImage(ExternalResource resource);
17+
}

src/main/java/top/focess/qq/core/bot/SimpleFriend.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import java.util.Map;
1010

11-
public class SimpleFriend extends SimpleSpeaker implements Friend {
11+
public class SimpleFriend extends SimpleTransmitter implements Friend {
1212

1313
private static final Map<Long, Map<Long,SimpleFriend>> FRIEND_MAP = Maps.newConcurrentMap();
1414
private final net.mamoe.mirai.contact.Friend nativeFriend;

src/main/java/top/focess/qq/core/bot/SimpleGroup.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import java.util.Objects;
1313
import java.util.stream.Collectors;
1414

15-
public class SimpleGroup extends SimpleSpeaker implements Group {
15+
public class SimpleGroup extends SimpleTransmitter implements Group {
1616

1717
private static final Map<Long, Map<Long,SimpleGroup>> GROUP_MAP = Maps.newConcurrentMap();
1818

src/main/java/top/focess/qq/core/bot/SimpleStranger.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import java.util.Map;
99

10-
public class SimpleStranger extends SimpleSpeaker implements Stranger {
10+
public class SimpleStranger extends SimpleTransmitter implements Stranger {
1111

1212
private static final Map<Long, Map<Long,SimpleStranger>> STRANGER_MAP = Maps.newConcurrentMap();
1313

src/main/java/top/focess/qq/core/bot/SimpleSpeaker.java renamed to src/main/java/top/focess/qq/core/bot/SimpleTransmitter.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
package top.focess.qq.core.bot;
22

33
import net.mamoe.mirai.contact.Contact;
4+
import net.mamoe.mirai.message.data.Image;
45
import net.mamoe.mirai.message.data.Message;
6+
import net.mamoe.mirai.utils.ExternalResource;
57
import top.focess.qq.api.bot.Bot;
6-
import top.focess.qq.api.bot.Speaker;
8+
import top.focess.qq.api.bot.Transmitter;
79

8-
public abstract class SimpleSpeaker extends SimpleContact implements Speaker {
10+
public abstract class SimpleTransmitter extends SimpleContact implements Transmitter {
911

1012

11-
public SimpleSpeaker(Bot bot, Contact contact) {
13+
public SimpleTransmitter(Bot bot, Contact contact) {
1214
super(bot, contact);
1315
}
1416

@@ -22,4 +24,10 @@ public void sendMessage(String message) {
2224
public void sendMessage(Message message) {
2325
this.contact.sendMessage(message);
2426
}
27+
28+
29+
@Override
30+
public Image uploadImage(ExternalResource resource) {
31+
return this.contact.uploadImage(resource);
32+
}
2533
}

0 commit comments

Comments
 (0)