rely on getting the instagram fb source page from the Plugin

src/main/java/com/meta/cp4m/message/FBMessageHandler.java

@@ -44,7 +44,7 @@ public class FBMessageHandler implements MessageHandler<FBMessage> {
   private final String appSecret;
 
   private final String accessToken;
-  private final @Nullable String connectedFacebookPageForInstagram;
+  private final boolean instagramMode;
 
   private final Deduplicator<Identifier> messageDeduplicator = new Deduplicator<>(10_000);
   private Function<Identifier, URI> baseURLFactory =
@@ -64,31 +64,25 @@ public class FBMessageHandler implements MessageHandler<FBMessage> {
       };
 
   public FBMessageHandler(
-      String verifyToken,
-      String pageAccessToken,
-      String appSecret,
-      @Nullable String connectedFacebookPageForInstagram) {
+      String verifyToken, String pageAccessToken, String appSecret, boolean instagramMode) {
     this.verifyToken = verifyToken;
     this.appSecret = appSecret;
     this.accessToken = pageAccessToken;
-    this.connectedFacebookPageForInstagram = connectedFacebookPageForInstagram;
+    this.instagramMode = instagramMode;
   }
 
   public FBMessageHandler(String verifyToken, String pageAccessToken, String appSecret) {
     this.verifyToken = verifyToken;
     this.appSecret = appSecret;
     this.accessToken = pageAccessToken;
-    this.connectedFacebookPageForInstagram = null;
+    this.instagramMode = false;
   }
 
   FBMessageHandler(FBMessengerConfig config) {
     this.verifyToken = config.verifyToken();
     this.appSecret = config.appSecret();
     this.accessToken = config.pageAccessToken();
-    this.connectedFacebookPageForInstagram =
-        config.connectedFacebookPageForInstagram().isPresent()
-            ? config.connectedFacebookPageForInstagram().get()
-            : null;
+    this.instagramMode = config.instagramMode();
   }
 
   @TestOnly
@@ -178,11 +172,7 @@ private void send(String message, Identifier recipient, Identifier sender) throw
     try {
       bodyString = MAPPER.writeValueAsString(body);
       url =
-          new URIBuilder(
-                  baseURLFactory.apply(
-                      connectedFacebookPageForInstagram == null
-                          ? sender
-                          : Identifier.from(connectedFacebookPageForInstagram)))
+          new URIBuilder(baseURLFactory.apply(sender))
               .addParameter("access_token", accessToken)
               .build();
     } catch (JsonProcessingException | URISyntaxException e) {
@@ -226,8 +216,7 @@ public List<RouteDetails<?, FBMessage>> routeDetails() {
                   throw new BadRequestResponse("unable to parse body");
                 }
                 // TODO: need better validation
-                String expectedObjectValue =
-                    connectedFacebookPageForInstagram == null ? "page" : "instagram";
+                String expectedObjectValue = instagramMode ? "instagram" : "page";
                 @Nullable JsonNode objectNode = body.get("object");
                 if (objectNode != null && objectNode.textValue().equals(expectedObjectValue)) {
                   return Optional.of(body);

src/main/java/com/meta/cp4m/message/FBMessengerConfig.java

@@ -10,25 +10,23 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Preconditions;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
-import java.util.Optional;
 import java.util.UUID;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 public class FBMessengerConfig implements HandlerConfig {
 
     private final String name;
     private final String verifyToken;
     private final String appSecret;
     private final String pageAccessToken;
-    private final @Nullable String connectedFacebookPageForInstagram;
+  private final boolean instagramMode;
 
-    private FBMessengerConfig(
-            @JsonProperty("name") String name,
-            @JsonProperty("verify_token") String verifyToken,
-            @JsonProperty("app_secret") String appSecret,
-            @JsonProperty("page_access_token") String pageAccessToken,
-            @JsonProperty("connected_facebook_page_for_instagram") @Nullable String connectedFacebookPageForInstagram) {
+  private FBMessengerConfig(
+      @JsonProperty("name") String name,
+      @JsonProperty("verify_token") String verifyToken,
+      @JsonProperty("app_secret") String appSecret,
+      @JsonProperty("page_access_token") String pageAccessToken,
+      @JsonProperty("instagram_mode") @Nullable Boolean instagramMode) {
 
         Preconditions.checkArgument(name != null && !name.isBlank(), "name cannot be blank");
         Preconditions.checkArgument(
@@ -42,19 +40,20 @@ private FBMessengerConfig(
         this.verifyToken = verifyToken;
         this.appSecret = appSecret;
         this.pageAccessToken = pageAccessToken;
-        this.connectedFacebookPageForInstagram = connectedFacebookPageForInstagram;
+    this.instagramMode = instagramMode != null && instagramMode;
     }
 
-    public static FBMessengerConfig of(String verifyToken, String appSecret, String pageAccessToken, @Nullable String connectedFacebookPageForInstagram) {
-        // human readability of the name only matters when it's coming from a config
-        return new FBMessengerConfig(
-                UUID.randomUUID().toString(), verifyToken, appSecret, pageAccessToken, connectedFacebookPageForInstagram);
+  public static FBMessengerConfig of(
+      String verifyToken, String appSecret, String pageAccessToken, boolean instagramMode) {
+    // human readability of the name only matters when it's coming from a config
+    return new FBMessengerConfig(
+        UUID.randomUUID().toString(), verifyToken, appSecret, pageAccessToken, instagramMode);
     }
 
     public static FBMessengerConfig of(String verifyToken, String appSecret, String pageAccessToken) {
-        // human readability of the name only matters when it's coming from a config
-        return new FBMessengerConfig(
-                UUID.randomUUID().toString(), verifyToken, appSecret, pageAccessToken, null);
+    // human readability of the name only matters when it's coming from a config
+    return new FBMessengerConfig(
+        UUID.randomUUID().toString(), verifyToken, appSecret, pageAccessToken, false);
     }
 
     @Override
@@ -79,7 +78,7 @@ public String pageAccessToken() {
         return pageAccessToken;
     }
 
-    public Optional<String> connectedFacebookPageForInstagram() {
-        return Optional.ofNullable(connectedFacebookPageForInstagram);
+  public boolean instagramMode() {
+    return instagramMode;
     }
-}
+}

src/test/java/com/meta/cp4m/message/FBMessageHandlerTest.java

@@ -330,9 +330,9 @@ void invalidMessage(
 
     FBMessageHandler messageHandler;
     if (isInstagram) {
-      messageHandler = new FBMessageHandler("0", token, secret, pageId.toString());
+      messageHandler = new FBMessageHandler("0", token, secret, true);
     } else {
-      messageHandler = new FBMessageHandler("0", token, secret);
+      messageHandler = new FBMessageHandler("0", token, secret, false);
     }
     DummyLLMPlugin<FBMessage> llmHandler = new DummyLLMPlugin<>("this is a dummy message");
     MemoryStore<FBMessage> memoryStore = MemoryStoreConfig.of(1, 1).toStore();

src/test/java/com/meta/cp4m/message/FBMessengerConfigTest.java

@@ -49,7 +49,12 @@ class FBMessengerConfigTest {
               .required(true)
               .validValues("123")
               .invalidValues("", " ")
-              .getter(FBMessengerConfig::pageAccessToken));
+              .getter(FBMessengerConfig::pageAccessToken),
+          ConfigParamTestSpec.of(FBMessengerConfig.class, "instagram_mode")
+              .required(false)
+              .validValues(true, false)
+              .invalidValues("anything that's not a boolean", 3.14)
+              .getter(FBMessengerConfig::instagramMode));
 
   static Stream<Named<ConfigParamTestSpec<FBMessengerConfig>>> required() {
     return PARAMS.stream().filter(ConfigParamTestSpec::required).map(p -> Named.of(p.name(), p));
@@ -94,6 +99,12 @@ void allInvalid(ConfigParamTestSpec<FBMessengerConfig> param) {
     for (JsonNode invalidValue : param.invalidValues()) {
       config.set(param.name(), invalidValue);
       assertThatThrownBy(() -> mapper.convertValue(config, FBMessengerConfig.class))
+          .withFailMessage(
+              "expecting the value of '"
+                  + invalidValue
+                  + "' to be invalid for field '"
+                  + param.name()
+                  + "'")
           .isInstanceOf(IllegalArgumentException.class);
     }
   }